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

RE: Reintegrating subbranches

From: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 16 Mar 2009 16:05:39 -0400

> Suppose we have a branch "feature1" of the trunk which implements some
> feature and subbranch "feature2" which implements another feature
> depended on the first feature.
> Suppose development of the first feature is finished and the
> of the second feature is half-way. Then one would want to reintegrate
> "feature1" back to the trunk.
> But "In Subversion 1.5, once a --reintegrate merge is done from branch
> to trunk, the branch is no longer usable for further
> work" (from /svnbook-1.5/svn.branchmerge.basicmerging.html).

That is not strictly true. There have been a few threads about this on
the list recently. If you record the revision of the commit of the merge
made to the trunk into the branch you can continue using it.

> So if I would reintegrate "feauture1" will it make impossible properly
> reintegrate also "feature2"? Or what?

Yes, since this is a separate branch I don't see a problem here. But,
I'm not 100% sure what the implications are. If you merge in from trunk
to the feature 2 branch then do a reintegrate it should work.

YMMV... try it in a test folder and see what happens. That is the
fastest way I have found to understand the new merge tracking stuff.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-16 21:07:13 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.