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

Re: Question regarding merging branches

From: Colin D Bennett <cbennett_at_radsoft.com>
Date: 2002-09-08 03:32:30 CEST

Hash: SHA1

You might find this information useful. I've wondered about merging between
branches myself, but just this morning I ran across the instructions on the
Linux1394 project Subversion page and they had a good example, of which I
attached an excerpt below for your convenience.

- -== ripped from: http://www.linux1394.org/svn.html ==-

Creating a branch or tag

Branches and tags are internally the same to Subversion. Basically a
lightweight copy method. So, it's as easy as:
# svn up
At revision XXX
# svn copy trunk branches/mybranch
# svn propset branch-point XXX branches/mybranch
# svn commit -m "Branched for 'mybranch'" The main difference between tags and
branches is how we use them. Branches are for concurrent lines of development
(e.g. Adding large pieces of funtionality), while tags are just meant to
alias a certain point in the tree.

Currently Subversion does not have direct support for keeping a branch in sync
with it's branch point (IOW, automated merging of changes to trunk into your
branch). This will be added soon enough, and we will use it when it does come
around. In order to merge changes from trunk into your branch:
# svn up
At revision XXX
# svn propget branch-point branches/mybranch
# svn merge trunk@YYY trunk@XXX branches/mybranch
# svn propset branch-point XXX branches/mybranch
# svn commit -m "Merge changes from trunk to 'mybranch'"

- --
Colin D. Bennett <cbennett@radsoft.com>
[ RADSoft: Rapid Engineering Specialists ]
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Sep 8 03:37:41 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.