[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: <Nick_Gianakas_at_sybari.com>
Date: 2004-09-24 18:14:13 CEST

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.

Regards,
Nick G.

Dave Eccleston <deccles@mitre.org>
09/24/2004 11:43 AM
Please respond to dev
 
        To: dev@tortoisesvn.tigris.org
        cc:
        Subject: Re: [TSVN] Re: TortoiseMerge: Editing conflicts

Simon Large wrote:
"Dave Eccleston" wrote
 
I absolutely love the three-panel view for resolving conflicts in
TortoiseSVN. However, sometimes it is not appropriate to pick theirs or
yours, but you want a combination of both. It would be nice if
TortoiseMerge would allow a user to enter arbitrary text as the result
of conflict resolution.
 

It would be nice, but I think asking TMerge to be an editor as well as a
diff/merge tool is too much - editors are complex beasts. Also, keeping
track of added and deleted lines in yours, theirs and merged when the user
is making edits as well sounds like a nightmare to me.
 
I'm disappointed you feel that way. 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. In
time, I will become irritated enough with this inadequacy to discontinue
use of the tool.

Your idea of enabling saves with conflicts only helps a little.

Dave

---------------------------------------------------------------------
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.