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

Re: Merge from trunk head

From: Scott Palmer <scott.palmer_at_2connected.org>
Date: 2006-01-04 19:45:36 CET

On 4-Jan-06, at 2:28 AM, Hari Kodungallur wrote:

> svn merge actually takes two URLs at different versions. Say URL1 and
> URL2. It takes the difference between the versions and applies it to
> your working copy. So, you merge command should be either
> svn merge -r N:M svn://<host>/project1/trunk
> or
> svn merge svn://<host>/project1/trunk_at_rev1 svn://<host>/project1/
> trunk@rev2

Are you sure that the second example does the same as the first? I
thought the "peg revisions" were used only to lookup a path that
might have changed in other versions. That is if URL1 and URL2 are
the same path then there is no difference. I think the help could be
clearer on this. I assumed that URL1 and URL2 would be tags at
different points or something similar.

This is case #1 from "svn help merge"

merge: Apply the differences between two sources to a working copy path.
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
        2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
        3. merge -r N:M SOURCE[@REV] [WCPATH]

   1. In the first form, the source URLs are specified at revisions
      N and M. These are the two sources to be compared. The revisions
      default to HEAD if omitted.

   2. In the second form, the URLs corresponding to the source working
      copy paths define the sources to be compared. The revisions must
      be specified.

   3. In the third form, SOURCE can be a URL, or working copy item
      in which case the corresponding URL is used. This URL in
      revision REV is compared as it existed between revisions N and
      M. If REV is not specified, HEAD is assumed.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 4 19:50:20 2006

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

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