Re: How to merge works done on various branches ?

hi,

2009/4/27 Olivier Sannier <obones_at_free.fr>:
> Please read the documentation, it explains all this and much more.

yes, read it please. but sometimes an example over a concrete example
and need can be very educative. see below for a quick reply to your
quick questions.

>> 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
>

before starting, it's much better to check you have no local changes.

assuming you are on the trunk directory ...

$ svn merge -c -3 <TRUNK_URL> .

please do notice the '-' and the '.'

>> 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

again assuming you are on the trunk directory ...

$ svn merge -c 7 <BRANCH_URL> .

it's also possible to use -r instead of -c. in the first case -r 2:3,
in the second -r 6:7.

after either case, you may want to check the differences. no commit
will be made, you have to do it yourself.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-28 13:01:18 CEST