Automatic Merge Problems

Chris Koenig · Post by **Chris Koenig** » Tue Dec 28, 2004 9:16 am

Using SOS Version 4.0.2

When we are attempting to use Multiple Checkouts, we're encountering problems with the automatic merge. Here's the scenario:

User A (only ever used SOS - never ran VSS)
User B (uses VSS)

User A Checks out File
User B Checks out File
User B Changes File
User B Checks In File
User A Chooses "get latest" with the attempt to Automatically Merge

User A recieves the following message box:

$/Test Automatic Merge.txt could not be automatically merged

User A then is left with their old version of the file and no changes from User B.

Any ideas on why we might be seeing this problem?[/list]

corey · Post by **corey** » Tue Dec 28, 2004 11:45 am

If the changes user A is making conflict with those made by user B, then the SOS Client will not be able to automatically merge the two files, and user A will need to do the merge manually. In this case, from the SOS menu, choose "Show Merge", and the configured merge utility will show the conflicting modifications.

Chris Koenig · Post by **Chris Koenig** » Wed Dec 29, 2004 8:42 am

OK, but won't this portentially become a problem if we try to "get latest" across several files at once?

Visual Source Safe will autmatically launch its merge utility when it encounters this condition and ask the user to deal with the problem then. Are you saying that we will have to manaully ask for a manual merge for each file that can not be automatically merged? If so, how will SOS help me identify which files need merging and which do not? So far, I have never seen the "Needs Merge" status listed on any of our files...

corey · Post by **corey** » Wed Dec 29, 2004 9:42 am

If you attempt a Get Latest on several files at once and automatic merge fails for several of them, SOS will show you a list of all of the files that require a manual merge.

You have probably not seen the "Needs Merge" status because your file lists were not refreshed before you performed a Get Latest. "Needs Merge" will definitely appear when it should as long as your file list is not stale.

Chris Koenig · Post by **Chris Koenig** » Mon Jan 03, 2005 8:04 am

OK -I can refresh the file list form within SOS before getting latest.

Are there any "gotchas" for switching between the SOS client and VS.NET? I know that MS recommends that when using VSS integration with VS.NET that you should NOT use the VSS client while using VS.NET. Is the same true for using SOS? If so, then can we still perform all of the same activities from VS.NET using SOS integration that we can from just using SOS client?

Thanks!
CK

corey · Post by **corey** » Mon Jan 03, 2005 9:44 am

With SOS 4.0, you should be able to run both clients simultaneously without any problems, but you should also be able to perform most operations from within VS.NET if you prefer.