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

Re: merge to individual file syntax

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2003-07-07 21:22:33 CEST

Ben Collins-Sussman wrote:

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

I've got a fix for this, but I'm not sure it's correct. If you pass in
merge_b->target to svn_client__get_revision_number as the path instead
of NULL, it's able to figure out PREV (it needs the working copy path to
do it). I'm not certain this is entirely correct though... It seems
like there are cases where the target of the merge is not the same as
the url...


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 7 21:23:28 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.