[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-27 17:28:42 CEST

> What you see in Meld is a four-way merge.
How do you figure? (1) Base. (2) Head. (3) Yours. I count three.

> > 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".
That's what happens when I try to simultaneously juggle developing 2
projects and responding to the list.
As I went on to say, 3-way diff isn't new. I was pointing out that 3-way
diff is not new; GNU has had it for a long time (obviously as a command
line tool).

> 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!
Relevance? I don't recall anyone suggesting to use the GNU code base.

> You have to understand that TMerge, even though it's part of TSVN is
> _not_ the main app.
I completely understand that. That's why I haven't been criticizing TSVN.
 I think any sensible person who has worked w/ more than one diff/merge
tool will agree that TMerge lacks several useful features. As I've
mentioned earlier in this thread, I'm mentioning it in hopes to spark some
ideas. And seeing how long this thread is getting, I'm not the only one.
Perhaps people see the excellent quality of TSVN and hope for the same in
TMerge.

> 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...
You're wrong in assuming I'm insinuating that Meld ported to Win32 be
shipped w/ TSVN (as TMerge or otherwise). I'm suggesting that a
best-of-breed diff/merge tool be created. It can then be used instead of
TMerge.

As for the install, it's not too far fetched to make the Python runtime a
requirement. Again, it doesn't have to be part of TSVN.

Regards,
Nick G

SteveKing <steveking@gmx.ch>
09/26/2004 04:50 AM
Please respond to dev
 
        To: dev@tortoisesvn.tigris.org
        cc:
        Subject: Re: [TSVN] Re: TortoiseMerge: Editing conflicts

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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 27 18:27:24 2004

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