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

Merge Wizard?

From: Peter McNab <mcnab_p_at_melbpc.org.au>
Date: 2007-11-01 11:48:05 CET

Hi devs.

Did a merge using the new sequence of dialogs (Wizard?).
Liked the explanation on the two choices of merge type.

In the same panel as the 'Test' button is another checkbox, whose
descriptive text I now forget.
However it's precise meaning was not clear to me and I couldn't readily
find a refernce to it in the help.

I'm wondering if it means the merge tracking is taught to remember the
merge but the WC is left untouched, much like using the 'Test" button.
Is the unmerged WC commitable?
Presumably the repo holds merge tracking info.
So when does that info get updated, at the time of the merge or when the
megred WC is committed?

Finally, the 'Test' button has moved away from the others and sit's
somewhat lonly in an oversized panel.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Nov 1 11:48:22 2007

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.