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

Re: Resolving conflicts

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 09 Mar 2008 15:40:11 +0100

Peter McNab wrote:
> Hi Devs
> When going throught the paces of merging the latest trunk to an old
> branch I have entered a range rev number -HEAD.
> Somewhere the proccess then mentions .. WC which left me wondering
> whether it was going to take HEAD as in of out of the repository or my
> local WC which might contain uncommitted mods and merge them across too.
> Just a point of momentary confusion.

It always merges changes from the repository *into* a WC, never *from* a
WC into another WC.

> When resolving conflicts and the two files are displayed side by side
> the Titlebar shows the filename being resolved. Thats good.
> However when minimized and you are looking for the diff again the name
> changes for every file.
> Maybe prefix the title with something consistent like Resolving..?

Are you talking about TortoiseMerge here? What window do you minimize?
What does the (I assume *title*) name change to for every file?

If you want the title to change to "Resolving filename", then that's a
no: people insisted strongly for having the filename *first* because
otherwise the taskbar would now show it and they couldn't see a
difference in the many entries they have in the taskbar.

> Juxtaposition stuff.
> When resolving conflicts and the two files are displayed side by side
> the norm seems to be "Theirs" to the left and "Mine" to the right.
> Again that makes sense.
> However while doing a merge as it progresses and conflicts arise the
> excellent dialog pops up with the 6 or so buttons.
> The top two appear to have the opposite juxtaposition to the Merge tool
> and the terminology is also different.
> It might be more consistent if the terminology or juxtaposition (or
> both) corresponded.

In TortoiseMerge, you're resolving a conflict with changes from three
different files, with the bottom showing you the result. You can then
chose which changes you want to *apply* to your local file.

The conflictresolve dialog shows you what changes you want to *keep*.
That's why there are different terms used, and why the position doesn't
'match' because it's not the same.

> Finally, at one point in the process it looked like I had made identical
> changes in the branch and trunk. At least I couldn't see any difference
> between the text on the left and right but a conflict was flagged. I
> say looked identical to my tired eyes so there might have been a
> difference. If the text was identical then maybe an auto resolve from
> the oldest to the newest could take place (check box anyone) ?

Whitespace changes also can create conflicts, but TortoiseMerge doesn't
show them if you've configured it that way.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-03-09 15:40:57 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.