The Help->About SourceGear Diffmerge window displays 3.3. Don't want to hijack this title, so will post appropriately after the 3.3.0 vs. expected diffs exit) when run from within a batch file but when not using "-diff=diff.txt" This is all in an effort to determine why "diffmerge -diff=diff.txt expected actual" fails to produce a diff.txt file without any indication of error, and ERRORCODE = 3 when run from within a batch file and valid results (ie. Yet, Program Files\SourceGear\Diffmerge still has DiffMerge.exe. 3.3.1.html says that DiffMerge.exe has a new name sdgm.exe. The file that appears on my system is named DiffMerge_3_3_0_18513.msi, but this is in fact version 3.3.1, correct?Īlso, the release notes page (. I'm a little confused by the name of the MSI file I get when I download the 3.3.1 version, and the reference to version 3.3.1 in the title of this post. Packages for all Windows, Mac, Fedora, and Ubuntu platforms can be found here: Then type "sudo apt-get install diffmerge" to install. See for instructions on adding our repository to your APT sources list. Ubuntu users can use our new APT repository to install DiffMerge.And the 64-bit installer installs both the 32- and 64-bit versions of the Explorer shell extension so that it will be available to both 64-bit Explorer and third-party shell replacements (which are usually 32-bit). On Windows, we've overhauled the Windows MSI installer to allow core DiffMerge components to be shared by multiple SourceGear products.Mac users please note that this 3.3.1 release is Intel-only.For Mac users we added a PKG installer in addition to the usual DMG package.New 64-bit releases for Windows, Fedora, and Ubuntu.If you do decide to try to reproduce this problem with a smaller project some day in the future, we'd really appreciate it if you could send us a bug report so that we could take a look at what's happening.SourceGear DiffMerge 3.3.1 is Now Available.Ī full changelog is given in Chapter 11 in the manual. I also would encounter merge conflicts when editing the same counter value in my for loop, so I'm really curious to know how you ran into this. Using Apple File Merge or SourceGear DiffMerge I was able to compare the changes between each version without any of the earlier changes being skipped. We don't have any specific timeline for these changes yet but we'll be sure to update our users when we have more information.įor what it's worth, I tried to reproduce your second issue with both 2017.1.1f.2.0f3 but wasn't able to run into it. We are aware of this limitation and plan to make improvements down the line. To your first concern, you're right that our current design doesn't make it easy for you to view specific changes (outside of what files have been modified) before you pull them. Person's 1 change is just gone and no conflict was ever raised.Ĭlick to expand.I understand. Install SourceGear DiffMerge individually 5. > External Tools > Keys > Revision Control Diff/Merge - notice SourceGear DiffMerge is not listed there. Its almost as if it only wanted to compare with the original change only and not future changesĢa) Both people edited a for loop in the same file (this is immediatly after that first test scenario)Ģb) Person 1 changed the for loop to be from i=0 to i=1Ģc) Person 2 changed the for loop to be from i=0 to i=4Īt this point there was no conflict and the value in the file was i=4 Install a full version of SourceGear Vault Professional 2. These changes are going to be called A (person 1) and B (person 2)ġc) Person 2 saw the publish and did an update creating a conflictġd) Person 2 resolved the conflict and put a new comment into the code to show it was resolvedġe) Person 1 made another change in the same placeġf) Person 2 (who has not done any publishing at this point) sees this new change and does an updateġg) Person 2 sees a conflict but instead of the conflict being between his resolution of the first conflict, and the new change, its between the original B change and the new change. 2 more things I found while evaluating conflicts between 2 peopleġa) Both people touched a function in some file. On Windows, we've overhauled the Windows MSI installer to allow core DiffMerge components to be shared by multiple SourceGear products.
0 Comments
Leave a Reply. |