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

Resolving conflicts

From: Peter McNab <mcnab_p_at_melbpc.org.au>
Date: Mon, 10 Mar 2008 01:03:44 +1100

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.

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

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.

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) ?

Gees I'm picky tonight.

To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-03-09 15:04:29 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.