Re: merge reintegrate

On 03/03/2008, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> As of r12255, the merge wizard has a new page for the 'reintegrate'
> feature. That means, the first page in the merge wizard has now three
> radio buttons for the user to choose from.
>
> That means we have to adjust the help/info text for each of the radio
> buttons. Suggestions are welcome!
>
> rev-range merge: should be clear what to use it for
>
> reintegrate: that's the new one. User can specify the source URL (e.g.,
> url of a branch to merge back into the trunk working copy). Nothing else
> has to be specified, the URL is enough. The reintegrate command gathers
> all necessary information itself. But: the working copy must be of depth
> infinite (i.e., no sparse checkouts), it must not have any local
> modifications, switched items or items that have been updated to other
> revisions than HEAD.

I haven't followed what reintegrate is about on the svn list. The name
doesn't give much of a clue ;-) So this does what? I have made changes
on a branch and I now want to merge all changes which have not been
merged yet back into trunk? Is this the same as 'auto-merge'?

Can you detect those conditions you mentioned and suppress the
reintegrate option if they are not met?

> tree merge: as before, merging the diffs of two urls into a working copy
>
> So, please suggest help/info texts for the start page of the merge wizard.
>
> Stefan
>
> P.S. Simon: the docs need updating too :)

Of course :) Just as soon as I understand it myself ;-)

Simon

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