Weight between items will break deployment if dependencies are added by hand in wrong order

Hi, I understand circular references are tough to implement(I wouldn't want to do have to do it..) but I'm not sure this issue fits in this category.

I was just poking about how you make sure node B gets deployed before A if A has a nodereference to B (A->B) and both A and B are added to the deployment plan by the user, and not by node_deploy_check callbacks.

Is there something I've not understood about the module, perhaps.

What's the best way to this? I would create a remove from plan procedure, use that to remove the item from plan and then add it back with the appropriate weight.

Is that how you would do it? Is there a better way?

I'm doing this right now:

foreach ($nids as $nid) {
        // If this node is already in the deployment plan then either
        // a) it was added by the user and will get checked down the line or
        // b) it was added through dependency checks and its already been
        // dealt with. So we just move on in this case.
        if (deploy_item_is_in_plan($pid, 'node', $nid)) {
            //remove it
            deploy_remove_item_from_plan($pid, 'node', $nid);
        }
        // Does this node exist on the remote server?
        $remote_key = deploy_get_remote_key(deploy_uuid_get_node_uuid($nid), 'node');

        // If it doesn't exist or the local version is newer, add it to the deployment plan,
        // with a weight of min(weight) - 1, and then run dependency checking on it
        $plan_node = node_load($nid);
        if ($plan_node && (!$remote_key || $remote_key['changed'] < $plan_node->changed)) {
            deploy_add_to_plan($pid, 'node', $plan_node->type .': '. $plan_node->title, $plan_node->nid, deploy_get_min_weight($pid)-1, DEPLOY_NODE_GROUP_WEIGHT);
        }
        if($plan_node)  module_invoke_all('node_deploy_check', $plan_node);

    }

Two things have changed in the code:
1)If the node is there in the deployment plan I remove it and then re-add it with proper weighting.
2)If the $node loads(it usually does, so I guess always..) run a dependency check on it. This is to prevent the situation where
A->B->C where info in C has changed but because B is unchanged, dependency check ends there.

awaiting any feedback..