[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [TSVN] Re: TortoiseMerge: Editing conflicts

From: Hughes, Bill <Bill.Hughes_at_cox.co.uk>
Date: 2004-09-24 18:15:32 CEST

Nick_Gianakas@sybari.com wrote:
> I've mentioned this before, but I'll mention it again since
> I'm not the
> only one who is dissapointed w/ TMerge.
> Look at meld (http://meld.sourceforge.net/)
>
> I feel like my hands are tied when using TMerge. And although it
displays
> 3 panes--it's not a 3-way merge. The panes are: Theirs, Yours. That's a
> 2-way diff. The 3rd pane in TMerge is a conglomeration--the merged output
> It's not part of the "diff". To make an effective merge, you need 3
> distinct views: Base, Theirs, Yours. The actual merged result can be
> done in a 4th pane, but it's more intuitive to do it over Yours since
> that's the copy to be committed.
> Lurking on the list for a while, I get the impression that some people
> think TMerge's 3 panes are innovative. Perhaps that's the case on
> Windows, but GNU has had it for a long time. 3-way diff isn't new folks.
>
> Please don't take offense. I think the TSVN group (especially Stefan) has
> done a spectacular job w/ TSVN; it's a superb tool--and I don't even use
> Windoze often.
>
> Unfortunately, Meld is built w/ GTK. Even worse, it has become part of
> the GNOME project recently, so it hooks into GNOME specific libs. That's
> fine for me since I use Linux most of the time. But most of my co-workers
> use Windows and continuously moan about TMerge. It's at the point where
> TSVN's rep is getting hurt.
>
> One promising facet of Meld is that it's built w/ Python. So it shouldn't
> be too difficult to port it to Win32 (strip out the GNOME specifics), or
> at least leverage its ideas.

Have you tried kdiff3?
I switch mostly between kdiff3 and winmerge - kdiff3 does a three-way merge
- you get to pick which of the three files you want the results in, and
winmerge lets you edit the file (a bit) while merging two files. I seem to
remember that winmerge is going to go three way, if it hasn't already.
I downloaded the source code to these with an eye to sticking my favourite
bits together but it's in my pending tray with hundreds of other useful bits
I don't have time for.
Bill

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
This e-mail transmission is strictly confidential and intended solely
for the person or organisation to whom it is addressed. It may contain
privileged and confidential information and if you are not the intended
recipient, you must not copy, distribute or take any action in reliance
on it. If you have received this email in error, please reply to the
sender as soon as possible and delete the message. Please note that we
are able to, and reserve the right to, monitor e-mail communications
passing through our network.
The views expressed in this email are not that of the company unless
specified within the message.
The inclusion of this footnote indicates that the mail message and any
attachments have been checked for the presence of known viruses.
If you have any comments regarding our policy please direct them to
postmaster@cox.co.uk
________________________________________________________________________
This email has been scanned for all viruses by the MessageLabs Email
Security System. For more information on a proactive email security
service working around the clock, around the globe, visit
http://www.messagelabs.com
________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 24 19:17:08 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.