Issues replicating changed and moved files from other branches

[swc-jesse]

I'm hitting a lot of errors like

//Foo/Foo/Bar.cpp - moved from //Foo/Bar.cpp but has no matching resolve record; must 'add -d' or 'move' to correct.

The common case in all of them is that the files are moved, edited and integrated in other branches prior to being merged into the current branch as a combined move / edit. This seems to really confuse things. My bat file solution for each file is to:

:: 1. Revert the offending file which will delete it and revert the moved file, bringing it back
p4 -p %target_port% -u %target_user% -c %target_client% revert %moved_file%

:: 2. Edit the original file
p4 -p %target_port% -u %target_user% -c %target_client% edit %deleted_file%

:: 3. Move the original file
p4 -p %target_port% -u %target_user% -c %target_client% move %deleted_file% %moved_file%

:: 4. Force sync the new file
p4 -p %source_port% -u %source_user% -c %source_client% sync -f %moved_file%@%source_change%

I'm pretty sure this is not the correct fix, since it loses the integration history in the present changelist - but I haven't found another way around these errors and they are quite numerous in some cases.

Here's a screenshot of a problematic "move / edit" (highlighted). In this case the file was populated and edited in the working branch (bottom yellow revision) moved in another branch and edited in various other branches, eventually merged back to the working branch new location (top yellow line) as one operation.

Any ideas?