Can this type of merge be done with Vault?

VisualCSharp · Post by **VisualCSharp** » Fri Apr 08, 2005 11:03 am

SourceGear Vault 3.0.5 (build 2833)

http://www.flickr.com/photo_zoom.gne?id=8808317&size=l

What I'd like to do here is merge BOTH of the new C# methods into the file. This feature exists in Visual SourceSafe's client as "Apply Both Changes". Additionally in VSS I was able to actually edit the merged file in the diff window. With SourceGear it doesn't look like I am able to do this. Is this possible?

Anyone have some experience to lend to my question?

dan · Post by **dan** » Fri Apr 08, 2005 12:07 pm

This is not yet available in the Vault Diff/Merge Tool, nor is direct editing. We plan to have these in the next major revision.

In the meantime, if you need this, Vault supports using any merge tool you can invoke from a command line - see the Tool->Options->Diff/Merge

dan · Post by **dan** » Fri Apr 08, 2005 1:39 pm

Oops - spoke a bit too soon.

You actually *can* apply changes to from both sides of a merge. Right click on the change and choose the "Apply this change" command, which you can do from each side, and then both changes will appear in the merged file.

Guest · Post by **Guest** » Mon Apr 11, 2005 7:19 am

dan, the problem with this merge is that when applying either the left or right pane to the middle pane, the opposite pane's available changes will change. The yellow selection is no longer available, and I am only afforded the ability to change the method name or the method return type. Again, this could be changed by allowing direct editing of the target pane (I saw in another post that this would be in the next major release).

GregM · Post by **GregM** » Mon Apr 11, 2005 8:09 am

I ran into this myself the other day. The problem is that once you apply the left change, the right pane is compared against the new middle pane contents. If the changes in the left pane and right pane are similar enough, such as adding a new function in the same place, then the changes in the right pane will now be seen as modifications of the changes from the left pane, because the opening and closing braces match, instead of added lines that can also be applied to the center pane.

dan · Post by **dan** » Mon Apr 11, 2005 8:46 am

OK, I see what you mean now. We'll take a look at it.