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

Re: svn merge error

From: <philip_at_codematters.co.uk>
Date: 2003-01-29 14:12:34 CET

Arild Fines arild.fines@broadpark.no writes:

 J:\tmp\testsvn merge -r HEAD:PREV Moo.file
 svn: A path under revision control is needed for this operation
 svn: svn_client__get_revision_number: need a version-controlled path to
 fetch lo
 cal revision info.
 
 I can't really make sense out of that error message. Isn't this supposed to
 work?

It's a bug, you need to specify numeric revision numbers in this case.
For a single file merge you also need to specify a destination file as
the default path is the directory '.' which will not work.

$ svn merge -r81:80 Moo.file Moo.file

 svn diff works fine, btw:
 
 J:\tmp\testsvn diff -r HEAD:PREV Moo.file
 Index: Moo.file
 ===================================================================
 --- Moo.file (revision 81)
 +++ Moo.file (revision 80)
 @@ -1,2 +1,2 @@
 -dkgjdfkgjhdfgkjdfg
 -dgdfg
 +lkhlodfhldfhggdf
 +gfdl�kgjhg�d

I've been meaning to try and clean up the diff/merge code in the
client library. I feel there is too much duplication as well as too
many special cases where diff and merge behave differently.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:23:50 2006

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