[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: Mark Phippard <MarkP_at_softlanding.com>
Date: 2004-09-24 19:44:05 CEST

Nick_Gianakas@sybari.com wrote on 09/24/2004 12:14:13 PM:

> 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 did not see where any of the meld screenshots show how it presents a
merge. Not saying it doesn't do it wonderfully, just saying that pointing
Windows users at a tool that does not run on Windows and does not show how
it does what you want, doesn't help.

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

I haven't had to use it enough to know what I think. Generally, I like
it, although I think some of the recent requests seem real valid. I do
not see the value of showing the Base version as it's own pane in the UI
since each of the two modifications show as their diff against Base, and
then how they relate to each other. Tmerge is a 3-way merge. I do not
see how showing Base adds anything not already present?

Also, the "merged" result automatically merges the non-conflicts, you just
have to deal with the conflicts. Since it is a conflict, there is no
"right value" so I do not see how it is relevant whether you feel it is
being applied to the "Theirs" version or the "Yours" version. There is
really just a single "merged" version where you have to resolve the areas
of conflict.

As others have indicated, I think that being able to work on a merge and
save it for later would be useful. Also, possibly some abilitty to
manually hack a resolution to a conflict would also be nice.

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

I do not think anyone is going to take offense at the sincere desire to
make this a better product. The only thing I find offensive is your use
of "Windoze". I would rather use OS X all the time, but I can't. Grow up
and save that crap for your Linux lists.

Finally, as others have pointed out, it is possible to plug in another
merge tool. I do not know if it is possible to plug in Araxis Merge, but
historically that seems to be one of the better Windows merge tools. I
have never used it, and I do not think there is a free version of it. I
think WinMerge is OK, but I also like TMerge and usually only use the
former to compare entired directory structures.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 24 20:57:27 2004

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