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

Re: simple question about "svn merge"

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-21 18:16:52 CET

On Sun, 2004-03-21 at 10:46, Robert P. J. Day wrote:
> reading the reference page on "svn merge", all of it seems
> straightforward, except for the last example:
> $ cd myproj
> $ svn merge -r 30:31 thhgttg.txt
> U thhgttg.txt
> i can see that this appears to be merging a change into your local
> working copy of the file "thhgttg.txt". but what file is being used as
> the basis to get the diff between revisions 30 and 31?

It's using the URL for your working file 'thhgttg.txt'. That is, it's
comparing two versions of that URL, and then merging it into your
working file.

> svn merge -r N:M SOURCE [PATH]
> but there's no definition of PATH anywhere that i can see.

Correct. If [PATH] is left off, then 'svn merge' generally assumes a
default value of '.' -- however, if you're comparing two versions of a
single file, and a working file by the same name exists, it will assume
a default [PATH] of the working file. This is briefly mentioned in
chapter 4, it might be discussed in the reference section too.

By the way, Robert, I get the impression that you're looking at an old
version of the book. My PDF page numbers don't line up with yours; are
you looking at revision 9103?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Mar 21 18:17:29 2004

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