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

Re: How to merge works done on various branches ?

From: Olivier Sannier <obones_at_free.fr>
Date: Mon, 27 Apr 2009 13:41:42 +0200

Please read the documentation, it explains all this and much more.

> 1) While at revision 9, I detect for example that the modifications
> done on revision 3 are not correct, and I'd like to remove them. Is
> there a "quick" way to do this ? I've identified a way, selecting all
> the files not modified on rev 4, 6 & 9, making a revert to rev 2, but
> it is a bit painful to do it manually. For the files also touched by
> at least one of the next revision, I redo manually also the operation.
Reverse merge :
http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo

> 2) While at revision 9, I detect that the modifications done on rev7
> on the branch (and only them, not the ones done on rev 5 and 8) are
> interesting to be added on the trunk for the next software delivery
> for example. Is there a "quick" way to do this ?
Cherrypicking :
http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html#svn.branchmerge.cherrypicking

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1944479

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-27 13:42:38 CEST

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