[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:49:58 CEST

Philip Martin wrote:

> Garrett Rooney <rooneg@electricjellyfish.net> writes:
>>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...
> The merge revisions always refer to the sources, never to the target,
> so you appear to be correct: your fix is wrong. That would make you
> right and wrong :)

Yeah, it seems like what needs to happen is that if we're trying to get
PREV, we need to get the wc path of the URL in question. So I think we
should check to see if merge_b->target refers to an entry with the same
url, and if so use that path, otherwise we'd have to find some other way
to get a wcpath, or error out, because PREV doesn't make sense if we
don't have a wcpath to associate with 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 21:50:49 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.