Merge Branches with a file both Renamed and Modified

[stevek2]

I am performing a Merge Branches where the Origin has files which were renamed in one changeset and then subsequently modified. After successfully identifying the Renames in the Origin, and applying them to the Target, the wizard proceeded to the Add, Deletes, Edits window, but there it shows a red "Not Found" message for those files, saying that "The target file for this Modify operation could not be found". Then I have to manually choose the new name in the target.

It seems to me that the wizard should 'know' that the modified file is now using a different name...

Also, as another suggestion, when I double-click on the red "Not Found" line, there is a "Choose Alternate File" dialog, but the tree control in the dialog does not remember its last selected item, so when doing this for a number of files in the same directory, I am forced to re-navigate through the tree to the same folder for _every_ file. Also, the dialog should display the name of the origin file, since the dialog window is big enough to obscure the origin filename underneath it, and when I have a number of files with similar names, it is error-prone because Vault will apply the Origin changes to whatever file I select, and there is no safety checks.

Thanks!

[stevek2]

Another idea for the "Choose Alternate File" dialog -- either add a button, or make the default behavior, that the tree control selects the Target folder that corresponds to the folder of the Origin file. Normally when you are merging branches back to the trunk, the Origin & Target often share very similar tree structures. Ie, if I am merging files from $/branch/ into $/trunk/ and the wizard cannot find a target match for file $/branch/a/b/c/foo.txt, the Choose Alternate File dialog should select the folder $/trunk/a/b/c in the tree control.

[stevek2]

Any response from SourceGear on this subject?

[Beth]

Sorry about that. I thought I had responded last week, but obviously, I missed submitting.

I will put in a feature request. Thank you for your feedback.

F: 14216

[stevek2]

Thanks -- so is SourceGear confirming that this is a 'bug' per se? I gave some ideas to make it easier to find the correct origin file to use, but it seems there is also a bug here in terms of the merge wizard not realizing the origin file has already been moved/renamed in the earlier steps of the wizard.

[Beth]

I don't think it's necessarily a bug as just something we could change to be much nicer. Either way, I have it logged so the developers will see it, and they will decide from there.

[tScott999]

It would also be very nice if the find interface could do the following items:
-Remember the last location it was opened (as I moved many of the files into the same location)
-Expand out the file selection interface such that it matches what is on the repository screen, but expands out to fit all of the open folder paths
-Add the ability to just paste in a path

[Beth]

I added your additional comments to the request, but I think some clarification will help.

-Remember the last location it was opened (as I moved many of the files into the same location)

The last location it was at before it was moved is recorded in the history. Are you saying you want that part of history included over in the merge somehow?

-Expand out the file selection interface such that it matches what is on the repository screen, but expands out to fit all of the open folder paths

Do you mean where there are changesets listed? Please explain further or post a screenshot of where you mean.

-Add the ability to just paste in a path

Is this possibly when adding files and now when performing merges?