[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: <webpost_at_tigris.org>
Date: Tue, 17 Mar 2009 04:38:58 -0700 (PDT)

> [I have send this msg before but it seems it has not appeared in
> the maillist. I send it second time.]

I subscribed Friday, sent post "Troubled by a strategy that has developers creating branches from..." (which still hasn't received response) that same afternoon, and didn't see the post in the list until sometime Sunday. Apparently, it just takes a while sometimes...

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

"The branch" does not mean "any branch" - only the one you re-integrated.

Brett S.

> So if I would reintegrate "feauture1" will it make impossible properly
> reintegrate also "feature2"? Or what?
> Huh?!
> --
> Victor Porton - http://portonvictor.org


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-17 14:11:53 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.