Re: merge to individual file syntax

Philip Martin wrote:

> Garrett Rooney <rooneg@electricjellyfish.net> writes:
>
>
>>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.
>
>
> No, don't use the target at all, use the source. PREV only makes sense
> if the merge source is a wc_path, so
>
> svn merge -rHEAD:PREV http://.... some/path
>
> is an error.
>

I'd love to use the source, but I don't have it. The source is
converted into a URL before it even gets this far, because
svn_client_merge takes urls as arguments, not paths.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 7 22:07:55 2003