Re: Question how to merge.
From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-02-12 19:29:17 CET
Patrick Mayweg <mayweg@qint.de> writes:
> Reading the fine svn book, did not give me any ideas, because all the
That's because you have to specify what you want to merge.
A merge command requires
* two sources to compare
* a wc target to apply diffs to
The 'sources' must be revision/path pairs. You can specify them
svn merge URL1@X URL2@Y wc
Or they can be both implicitly be HEAD:
svn merge URL1 URL2 wc
Or they can be specified like
svn merge -rX:Y URL wc
*You* have to keep track of the revisions. You need to remember (or
svn merge -r100:HEAD BranchURL wc
---------------------------------------------------------------------
|
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.