Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
yes, perhaps i'll take a shot at using ediff... always hated the emacs interface, though. so. Anybody else know of similar tools? keith d. zimmerman, mcsd eagle solutions -----Original Message----- From: Mitch Davis [mailto:Mitch.Davis at EXTEL.COM.AU] Sent: Wednesday, June 18, 2003 8:43 AM To: Keith D. Zimmerman; tortoisecvs-users at lists.sourceforge.net; cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: RE: [cvsnt] Merge Application > > Yes see below. I presume you're looking for a 3-way > > because you want to specify where the output should go. > > You can do this by making a copy of a directory and > > working on the copy. > > A three-way merge is something else - useful for when > > you have a base file from which TWO lines of development > > have occurred. > > i am looking for a true three-way merge, and not just > to save else where, I essentially have "two lines of development. > I've used winmerge, its a great two way merge, but... > > XEmacs is the only three way in that list? XEmacs is the only one of these three that has a 3-way merge. There may be other tools (free and not free) but I don't know of them. You can have a look at how it appears by going here: http://www.cs.washington.edu/homes/gjb/ToolsTalks/emacs/ppframe.htm Scroll down the left-hand side and click on "EDiff". In this (small) screen shot, the user is looking at diff 4 out of 20. The cyan text shows words that have been inserted. When in ediff mode, copying from one buffer to another is as simple as pressing "a" or "b". In 3-way mode, you'd press "ab" to copy the "a" change to buffer "b". Is this more like you're looking for? As far as I know, ediff won't act recursively on directories. I got around this by writing a shell script which used "diff" to find files which differed, then called "gnuclient" (part of XEmacs) to run the XEmacs command to start up ediff on the files. Mitch. ------------------------------------------------------------------------ ---------------------------- The information contained in this message and any attachments is confidential and intended for the named recipient(s). If you have received this message in error, please contact sender by return e-mail and destroy the message and any attachments. Any opinions or undertakings expressed in this message are those of the individual sender except where the sender expressly and with authority states them to be the opinions of Extel. ------------------------------------------------------------------------ ----------------------------