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

[TSVN] Re: Suspect: (SYB)Re: [TSVN] Re: TortoiseMerge: Editing conflicts

From: <Nick_Gianakas_at_sybari.com>
Date: 2004-09-24 22:40:05 CEST

> Except, scrolling the screen scrolls all the views making it just as
easy
> to see the same info.
On the contrary; that's another area of TMerge that lacks. TMerge lines
up the 2 files in a fixed position. If one file has additional lines,
blank lines are added to the other file so the remaining lines match up.
That adds more confusion when trying to "figure out" what's going on.
There was a recent discussion about this--the blank lines are displayed by
TMerge, but aren't actually in the file. It's not very intuitive. Meld
lines up the source lines as you scroll. Look at the screenshots and
you'll see one file has additional lines. Instead of adding "fake" space
to the other file, it uses lines to show where the additional lines
reside. And when you scroll, the extra lines move more/faster such that
when you scroll passed the difference, the source is already lined up.
Very intuitive.

Since this is somewhat difficult to explain in words, I slapped together a
small animation:
  http://www.wheeloyum.com/meld.gif 1.2MB
Notice what's happening as I scroll either pane.

Regards,
Nick G.

Mark Phippard <MarkP@softlanding.com>
09/24/2004 03:47 PM
Please respond to dev
 
        To: dev@tortoisesvn.tigris.org
        cc:
        Subject: Suspect: (SYB)Re: [TSVN] Re: TortoiseMerge:
Editing conflicts

Nick_Gianakas@sybari.com wrote on 09/24/2004 03:50:04 PM:

> > Have you actually used TMerge before?
> Admittedly briefly. Once I discovered how much it lacked, I stopped
using
> it.
>
> > The two modified files show all of
> > their differences from their base.
> My mistake. I see it shows an inline diff w/ the base. I guess once
you
> use a 3-paned GUI, it's awkward to use inline diff and 2-pane diff at
the
> same time. With TMerge, you have to determine each file's change
(Theirs
> or Yours) from the base via inline diff, then you have to carry it over
to
> the other side and repeat teh process. It's simpler in a 3-way
> side-by-side pane because you can see how the same change from Base was
> made in Head vs Yours. Kind of like following the color across the
> screen. Along the same thought process, I think Meld's finer diff
> granularity goes a long way here--you don't have to manually scan each
(of
> 4) lines to find a change.

Except, scrolling the screen scrolls all the views making it just as easy
to see the same info. Also, since the purpose of TMerge is to resolve
conflicts, you typically really need to just concern yourself with the
conflicts. The part of the merge that does not conflict is handled
automatically. The info is just there for your benefit.

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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 25 15:31:38 2004

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