[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: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 1 Dec 2011 10:15:42 -0500

> 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.

He is right. After you do a re-integrate merge the merge info on the target is recorded. But, you can't do another merge into the branch because it will be confused. So, you do have to do a record merge to add the merged revision to the branches merge info so it won't try to merge that into the branch again.

So, he would need to do a merge into the branch from trunk (or whatever it's anscestor is), select the specific revision of the merge commit and then choose "record only" on the merge options dialog.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-01 16:15:47 CET

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