[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: SteveKing <steveking_at_gmx.ch>
Date: 2004-09-26 10:50:51 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/)

Yes. Meld, like most other diff/merge tools have features that TMerge
doesn't have. And not one of them has _all_ features the other merge
tools have. There's always one tool better than the other, depending on
what you just need right now.

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

TMerge _is_ a 3-way merge. What you see in Meld is a four-way merge.

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

GNU has something for a long time? Don't make jokes here. Maybe it had
it for a long time as a command line tool. But a GUI-tool doing that
hasn't been there "for a long time".

And please, do me and yourself a favour and have a look at the GNU diff
(and maybe patch) sourcecode.
Did you do that? How do you feel now? Do you feel the urge to throw up?
Yes? I did too!

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

You have to understand that TMerge, even though it's part of TSVN is
_not_ the main app. It's just a tool which comes with TSVN so users
don't have to download, install and configure a third-party diff tool
before TSVN can even be used right.
Before I started TMerge, TSVN didn't ship with a diff tool. That was
very disturbing for people. Then I looked around what diff tools were
available, but none of the free ones could do three-way merges. Even
though e.g. WinMerge has an RFE for that in it's issue tracker for more
than a year it won't be done. So I started TMerge myself.
And given the fact that I'm the only one working on TSVN and TMerge
without getting paid for it I think it's really good - at least good
enough for most people.

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

Python? Great! Once you've ported Meld to Windows, we will ship TSVN as
a 30MB installer instead of a 5MB installer right now.
I really hope you're kidding here...

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Sep 26 12:00:40 2004

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