Re: merge to individual file syntax

Ed L Cashin <ecashin@uga.edu> writes:

> 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.

This looks like a real bug. Your use-case matches the 2nd syntax
described in 'svn help merge'. Would you file it?

---------------------------------------------------------------------
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:35:15 2003