Tag: merge

Posted on

Merging from a revision

Example that wants just what was done in revision 2723 in trunk:

svn merge -c [good_revision] [repository_url]
svn merge -c 2723 http://halsvn01/svn/hal/trunk

This will rollback revision 2723 in trunk, pay attention to the negative sign in front of the revision number:

svn merge -c -[bad_revision] [repository_url]
svn merge -c -2723 http://halsvn01/svn/hal/trunk

Older methods as show by Guillaume below, the one above are now supported and recommended by me.

svn merge ~/branches/features/your-feature-t0-merge-no-ending-slash -r 995:999

Where 995 represent the first revision and 999 represents the last revision to merge

$ svn merge -c 614 https://secreturl/trunk or $ svn merge -r 613:614 https://secreturl/trunk.

The first means apply changes in revision 614 only, while the second form means take all changes required to go from r613 to r614 and apply them here.

Posted on

Resolving conflict when merging

Today, we had a conflict when merging the jboss stabilization branch into the RC. Here are the steps I used to resolve it. The basic process was to first merge the RC into the jboss-stabilization branch, resolve the conflict and then merge the jboss-stabilization branch back into the RC:

552 svn co http://halsvn01/svn/hal/branches/features/jboss-stabilization
553 svn status
554 cd jboss-stabilization/
555 svn status
556 svn info
557 svn merge http://halsvn01/svn/hal/branches/RC/12.11-RC
558 svn status
559 svn resolve --accept=working halwebsite/com
560 svn status
561 svn commit -m "Sync jboss-stabilization branch with 12.11-RC"
562 ls
563 cd ..
564 rm -rf jboss-stabilization/
565 svn co http://halsvn01/svn/hal/branches/RC/12.11-RC
566 cd 12.11-RC/
567 svn merge --reintegrate http://halsvn01/svn/hal/branches/features/jboss-stabilization
568 svn status

-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com
-------------------------------------