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

simple question about "svn merge"

From: Robert P. J. Day <rpjday_at_mindspring.com>
Date: 2004-03-21 17:46:43 CET

  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?

  on the previous page, the format of this command is defined as

  svn merge -r N:M SOURCE [PATH]

but there's no definition of PATH anywhere that i can see.


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

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