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

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
> merges there were in the form with revision numbers.

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
explicitly, like

   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
   svn merge -rX:Y wcpath wc

*You* have to keep track of the revisions. You need to remember (or
 ask 'svn log') which revision your branch was created in. Assuming
 it was created in revision 100, you'd run

   svn merge -r100:HEAD BranchURL wc

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 12 17:32:21 2003

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