DiffMerge 3.0 skip to first change?

[Saturn]

Diffmerge 3.0 is almost perfect. However, the old Diffmerge used to skip to the first change when a diff was opened. It no longer does that. Is there a way to make it do that?


Also, when performing a merge using Diffmerge 3.0 and Vault 3.5.2, when Diffmerge closes, Vault no longer asks if you'd like to resolve the merge status. Why not?

[Beth]

I tried this out and found that it depends on the last place the user made a change at before they had to merge. When I had a user making changes at the top, that's where the merge started at, but if the user was making changes towards the bottom, then it went there. I can enter a request for the developer to change that behavior if you wish.

I still get the window to 'resolve the merge status' though when I close the tool.

So I can get a better idea of the environment this is used in, can you copy the information from Help - Technical Support here for me?

Are you using this with just the Vault GUI alone?

[Saturn]

We are using the straight Vault GUI, no VS integration or anything.

For the first issue, I'm not talking about doing a merge - just a diff. The old utility used to skip to the first difference. The new Diffmerge 3.0 does not. You need to hit F7 or the big button in the toolbar to get to the first change. It always starts at the top of the file displaying line 1.

I figured out how to duplicate this on another machine. Remove the /ro2 from the Arguments in Vault. I like to be able to edit my working version of the file while doing a diff. Without this argument, DiffMerge 3.0 annoyingly always displays line 1 first.

For the second issue of Vault not prompting to resolve the merge, I was able to duplicate that easily with DiffMerge 3.0. No arguments were changed.

[jeffhostetler]

Yes, the Edit View doesn't currently warp to the first change.

The Reference View does (and that's why the /ro2 trick works).

I'll log this and get a fix in for the next release.

[Saturn]

Thanks for confirming problem 1.

Does Vault look for a return value from diffmerge to determine whether or not to dispay the dialog asking about resolving the merge status?

[Beth]

I get that dialog, so there's gotta be some difference here we're not seeing. Check in your Vault GUI under Help - Technical Support. Can you copy that information here for me?

[Saturn]

Sure:

Code: Select all

Client Information
    Vault Client Version: 3.5.2.5087
    .Net Framework Version: 1.1.4322.2052
    Operating System: Microsoft Windows XP Professional
    Service Pack: 2.0
    OS Version: 5.1.2600
    Total Physical Memory: 2 GB
    Time Zone: (GMT-06:00) Central Time (US & Canada)
    
Server Information
    Vault Server Version: 3.5.0.4741
    .Net Framework Version: 1.1.4322.2300
    Operating System: Microsoft(R) Windows(R) Server 2003, Web Edition
    Service Pack: 1.0
    OS Version: 5.2.3790
    Timezone: (GMT-06:00) Central Time (US & Canada)
    SQL Version: Microsoft SQL Server  2000 - 8.00.2039 (Intel X86) 
        	May  3 2005 23:18:38 
        	Copyright (c) 1988-2003 Microsoft Corporation
        	Enterprise Edition on Windows NT 5.2 (Build 3790: Service Pack 1)
    
License Information
    4 serial number(s):
        1 of 4: 5 users, permanent
        2 of 4: 5 users, permanent
        3 of 4: 5 users, permanent
        4 of 4: 5 users, permanent

[Beth]

Ok, I know our clients can talk to different versions of the server in the same major release, but I think 3.5.2 had some big changes that may affect this. Do you have a 3.5.0 client anywhere that you can try a merge on to see if you get the resolved merge pop-up?

[Saturn]

I've duplicated it on 3.5.2 on a 3.5.2 (demo) server:

Code: Select all

Client Information
    Vault Client Version: 3.5.2.5087
    .Net Framework Version: 1.1.4322.2032
    Operating System: Microsoft Windows XP Professional
    Service Pack: 2.0
    OS Version: 5.1.2600
    Total Physical Memory: 1.37 GB
    Time Zone: (GMT-06:00) Central Time (US & Canada)
    
Server Information
    Vault Server Version: 3.5.2.5087
    .Net Framework Version: 2.0.50727.42
    Operating System: Microsoft Windows XP Professional
    Service Pack: 2.0
    OS Version: 5.1.2600
    Timezone: (GMT-06:00) Central Time (US & Canada)
    SQL Version: Microsoft SQL Server  2000 - 8.00.760 (Intel X86) 
        	Dec 17 2002 14:22:05 
        	Copyright (c) 1988-2003 Microsoft Corporation
        	Developer Edition on Windows NT 5.1 (Build 2600: Service Pack 2)
    
License Information
    0 serial number(s):

[Saturn]

I've tried all sorts of ways of showing the merge (Source menu, context menu in the search panel, context menu in the file list...) I do my merge, save the center panel and quit. I can't get the prompt to come up at all...

As soon as I switch back to sgdm.exe, it works as it should and prompts me to resolve the merge status.

[GregM]

I seem to remember a thread about this, where Vault doesn't put up the prompt for merge programs other than sgdm.exe because they couldn't reliably tell when the merge was completed. I can't find that thread now.

[Saturn]

I seem to remember a thread about this, where Vault doesn't put up the prompt for merge programs other than sgdm.exe because they couldn't reliably tell when the merge was completed. I can't find that thread now.

This one maybe?

http://support.sourcegear.com/viewtopic ... light=sgdm

[Saturn]

Sure enough. If I rename diffmerge.exe to sgdm.exe and use it with Vault the prompt comes up as expected.

Thanks GregM!

[jeffhostetler]

I've logged a bug report for this problem. Vault should
respect the results from both sgdm.exe and diffmerge.exe.

[GregM]

You're welcome. I assume that this is happening because 3.5.2 was released before diffmerge.exe, and thus didn't know it was a "safe" merge tool.