Re: Merge Wizard?

Peter McNab wrote:

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

"only record the merge"

> However it's precise meaning was not clear to me and I couldn't readily
> find a refernce to it in the help.

The help isn't yet fully updated.

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

The "Test merge" button does what it says: it tests the merge
(previously called "Dry run"), but it doesn't actually *do* the merge.

The "only record the merge" checkbox makes the merge execute, but not
change any files. The merge is recorded only by modifying the svn:merge
property according to the merged revisions, and the merge db on the
server. But no files/folders are changed.
This can be used to 'block' certain revisions from getting merged.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org