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

Keeping a reintegrated feature branch alive

From: Woinoski, Michael <MWoinoski_at_bottomline.com>
Date: Tue, 29 Nov 2011 13:34:35 -0500

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?

 

Thanks,

Mike

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2889105

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-29 19:58:21 CET

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