[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: Tue, 17 Mar 2009 09:42:39 -0400

> > 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_at_subversion.tigris.org].
Received on 2009-03-17 14:43:33 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.