Re: [TSVN] Re: Re: TortoiseMerge: Editing conflicts
From: Dave Eccleston <deccles_at_mitre.org>
Date: 2004-09-27 06:17:20 CEST
Weird. In this earlier email you understood what I meant. Not sure why you flamed me later on. Maybe you forgot you understood."Dave Eccleston" wroteI'm disappointed you feel that way.Maybe I am speaking out of turn. It would almost certainly be Stefan doing the hard work. I am just a TSVN user.The need to edit conflicts comes up about half the time, and in those cases I end up feeling that I have wasted my time by even trying to use TortoiseMerge for this purpose.I agree that if you resolve some conflicts and right at the end find a bit which you are unable to complete, it could be frustrating. TMerge only supports resolve-all or resolve-nothing at present.
Thank you! Yes, that's the answer. I have found that the commercial product Perforce comes with a 3-way merge tool. The diff and merge tool part are available for free. Perforce lets you do theirs, yours, or edit the results. So far no drawbacks at all, seems to do everything just how I like. And it plugs in easily to svnup, the svn client I use. (I had installed TortoiseSVN just to get TortoiseMerge to plug into svnup. Now I can uninstall TortoiseSVN and it'll stop messing with my Windows Explorer. Would be more versatile if TortoiseMerge was available as a stand-along application, but whatever.)You can also use 3rd party diff/merge tools if you don't like TMerge, and the help file provides links to 5 different free/shareware ones (appendix A 3.6). I have not tried any of them myself, but one of them might do what you want. Let us know what you find. Simon
If you want to try out the Perforce diff and merge here's a link. Download the "Core Perforce Windows Installer", and when the install lets you configure, just uncheck everything but the diff and merge tool.
Windows installer: http://www.perforce.com/downloads/perforce/r04.2/bin.ntx86/perforce.exe
--------------------------------------------------------------------- To unsubscribe, e-mail: email@example.com For additional commands, e-mail: firstname.lastname@example.org Received on Mon Sep 27 08:45:40 2004
This is an archived mail posted to the TortoiseSVN Dev mailing list.