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

merge to individual file syntax

From: Ed L Cashin <ecashin_at_uga.edu>
Date: 2003-07-07 16:26:02 CEST

Hi. I wanted to undo the changes in .config that I got on the last
update. The last update contained other changes that I don't want to
undo. I can see what needs to be done like this (in my wc):

  svn diff -r HEAD:PREV .config

... but the analogous merge command doesn't work:

  svn merge -r HEAD:PREV .config
  svn: A path under revision control is needed for this operation
  svn: svn_client__get_revision_number: need a version-controlled path to fetch local revision info.

I tried a couple variations:

  svn merge ROOT/.config@HEAD ROOT/.config@PREV .
  svn: A path under revision control is needed for this operation
  svn: svn_client__get_revision_number: need a version-controlled path to fetch local revision info.

... where ROOT was
svn+ssh://jeremy/home/ecashin/svnroot/2.5-macc/trunk. Finally I
applied the diff with patch, but I am curious what the right
incantation was in this case.

-- 
--Ed L Cashin            |   PGP public key:
  ecashin_at_uga.edu        |   http://noserose.net/e/pgp/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 7 16:27:00 2003

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.