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

Re: Keeping a reintegrated feature branch alive

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 29 Nov 2011 21:28:02 +0100

On 29.11.2011 19:34, Woinoski, Michael wrote:
> My project is migrating from Perforce to Subversion. Currently, our
> development process uses feature branches (one per developer). We’d like
> to keep using the working copies of our feature branches after
> re-integrating them into the trunk. The Red Book says I can do that from
> the command line with the following command:
>
> cd my_calc_wc
>
> svn merge --record-only -c 391 ^/calc/trunk # assuming 391 is the rev of the re-integration merge
>
> If I use TortoiseSVN to re-integrate my feature branch into the trunk,
> do I still need record the merge in my feature branch’s working copy? If
> so, is there a way to do it using Tortoise (e.g., the “Only record the
> merge” option on the Merge Options dialog), or do I have to use the
> command-line client?

After a merge has been done, you normally shouldn't need to do a
--record-only merge since the merge itself should have already added all
the merge info.
But you can do the same in the TSVN merge dialog. See the attached
screenshot.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2889130
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Image_1.png
Received on 2011-11-29 21:28:15 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.