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

merge reintegrate

From: Stefan Kng <tortoisesvn_at_gmail.com>
Date: Mon, 03 Mar 2008 21:21:41 +0100

Hi,

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.

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 :)

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-03-03 21:22:03 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.