Issues with DiffMerge

[jb]

First off, we are using Version 3.0.1 (2769) of Vault with Version 1.1.0 (2769) of DiffMerge. All issues are noted under a 3-way merge. All issues are repeatable and some have been tested and repeated on more than one PC. The files being merged are all encoded as standard ANSI. Code is C++ with MFC elements.

I looked around the groups and didn't notice an earlier posting regarding this issue.

We have noticed the following issues with the DiffMerge tool which make the merge functionality of the tool unusable. They are possibly related too a single issue.

I think you have a great interface, but we cannot use a tool that alters data, even if only 1% of the time. When I first noticed this issue, the code was merged, checked in and being rebuilt. I am glad that the corrupt code was flagged by the compiler before things got too far.

1) We are able to corrupt the left pane in a 3-way merge by using the "Insert This Change In other File" Method on a Green item. The new block of code being merged could come from either the right or left pane, but the corrupt pane is always the left. To cause the issue a blank line from the left or right pane file must be merged first using the same method.

2) Using undo or redo repeatedly can cause the code in the panes to change to something different than what was ever there and eventually will cause the tool to crash.

Thanks in advance for a prompt reply. We are actively evaluating Vault as a possible company standard.

Sample code will be provided upon request to SourceGear employees only for debugging, if necessary.

Jon

[Guest]

Yes, we would definitely like to see the sample code and the steps to reproduce. You don't need to send the whole file - just the chunk of the file where the problems happen, and step by step instructions on how to reproduce.

You can either post them here, or send me email in the link below.

[dan]

Oops - I got logged off somehow. There should be an email link now if you want to go that route...