[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 21:50:04 CEST

> Thanks for the screenshots, I will take a closer look. I was expecting
to
> see a 4th pane based on your previous comments.
As I said in my original post:
   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.

Meld takes the latter approach--merge in "Yours".

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

Regards,
Nick G.

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

Nick_Gianakas@sybari.com wrote on 09/24/2004 02:50:19 PM:

> > 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.
> Good observation; I've never noticed that. Attached to this message are

> two screenshots of my own showing the 3 panes. It's not the best, but
you
> get the idea. The second shows quick access to add above/below/both
> (could use the context menu too).

Thanks for the screenshots, I will take a closer look. I was expecting to

see a 4th pane based on your previous comments.

> I'm not affiliated w/ Meld in any way.

I didn't not think you gave that impression before, just pointing out that

were someone interested to see what you liked they couldn't get it from
the web site, they would have had to have Linux available to them.

> When you are merging two files, they must have a common base. The diff
> view in TMerge shows the conflicting lines between the modified files.
It
> says nothing about the original (base) file.

Have you actually used TMerge before? The two modified files show all of
their differences from their base. The conflicting differences are called

out and have to be resolved. The non-conflicting differences are already
merged into the combined file and the decisions you make about the
conflicts resolve the rest of the file.

Take a look at the docs:

http://tortoisesvn.tigris.org/docs/TortoiseMerge_en/ch02.html#tmerge-ch-2-sect-1-1

> must determine what each modification is for. The head's modifications
> are made for some purpose, your modifications are made for (most likely)

> another. As such, the merge process is just that--"merging" two
> modifications. I find it's rarely as clean cut as just one or both. So

> to properly merge, you need to determine the reason of each change
first,
> then _edit_ your version to incorporate both sets of functionality. The

> only way to accurately determine the purpose of each modification is to
> see what it changed from--the base.

TMerge does show what is changed from base. I haven't looked at a recent
build, but it might be cool if TMerge picked up some of TBlame's ability
to show the log message and other info from the various versions.

The rest of your comments are all based on this incorrect view that you
cannot see the changes relative to base, so I will leave it at that for
now.

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:36 2004

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