[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: Peter McNab <mcnab_p_at_melbpc.org.au>
Date: Mon, 10 Mar 2008 07:17:08 +1100

Stefan Küng wrote:
> 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.

Ah thanks.
I was just momentarily fearful that WC was mentioned in the context of
the source and it was going to use my local changes from the trunk. The
whole (small) repo is checked out.

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

OK. With TortioseMerge, the one with all the coloured lines including
nasty red ones. When that gets minimized and you later want to restore
it, it's name keeps changing depending on what file was last being
resolved. There is already one called Merge but thats the 6 button dialog.

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

Ahha My problem was the taskbar also had many entries and I couldn't
recognise it. They weren't for merges in progress though.
I'm not that cognitive to do more than one at a time and thankfully
that's how the wizard presents the work, so how do others get multiple
minimized unfinished merges going? Rhetorical question. I'm sure there
is a way so probably no need to answer.



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 21:17:34 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.