On 01/11/2007, Stefan Küng <tortoisesvn@gmail.com> wrote:
> 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.
Well that bit was ;-)
<para>
If you are using merge tracking and you want to mark a revision as
having been merged, without actually doing the merge here, check the
<guilabel>Only record the merge</guilabel> checkbox. There are two
possible reasons you might want to do this. It may be that the merge
is too complicated for the merge algorithms, so you code the changes
by hand, then mark the change as merged so that the merge tracking
algorithm is aware of it. Or you might want to prevent a particular
revision from being merged. Marking it as already merged will prevent
the merge occurring with merge-tracking-aware clients.
</para>
Which part needs clarifying?
Simon
--
___
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
Received on Fri Nov 2 22:51:39 2007