You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Victor Porton <po...@narod.ru> on 2009/03/15 17:08:42 UTC
Reintegrating subbranches
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).
So if I would reintegrate "feauture1" will it make impossible properly
reintegrate also "feature2"? Or what?
Huh?!
--
Victor Porton - http://portonvictor.org
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1327727
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Reintegrating subbranches
Posted by Bob Archer <bo...@amsi.com>.
> > 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.
>
> I don't understand you. What you mean saying "record the revision"?
Read this thread for the discussions on this.
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageI
d=1199015
> So what? Can I run svn merge --reintegrate .../feature2 from the
trunk?
> (even despite I have not reintegrated feature2 into feature1)
Once again, YMMV buy I think yes. Svn should be able to track the
ancestory properly. But, as I say, test. This is a scenario that I have
not attempted.
BOb
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1341185
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Reintegrating subbranches
Posted by Victor Porton <po...@narod.ru>.
On Mon, 2009-03-16 at 16:05 -0400, Bob Archer wrote:
> > 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).
>
> 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.
I don't understand you. What you mean saying "record the revision"?
To which branch you refer?
> > 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.
So what? Can I run svn merge --reintegrate .../feature2 from the trunk?
(even despite I have not reintegrated feature2 into feature1)
Any problems with this?
Can anyone explain about this problem in details?
--
Victor Porton - http://portonvictor.org
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1335163
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Reintegrating subbranches
Posted by Bob Archer <bo...@amsi.com>.
> 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).
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.
BOb
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1335140
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].