Brian Denny <brian@briandenny.net> writes:
> On Thu, Mar 06, 2003 at 09:56:24AM -0800, Ben Collins-Sussman wrote:
> >
> > If you run 'svn merge -rX:Y FOO', then this is what should happen:
> >
> > * if '.' isn't part of a working copy, error.
> >
> > * if FOO is local path, check to see if it's a file or dir within
> > '.', then get its url, and run
> >
> > svn merge -rX:Y URL FOO
> >
> > If FOO isn't a file or dir within '.', then error.
> >
> > * if FOO is already a URL, then check to see if its basename is a
> > file or dir within '.', and run
> >
> > svn merge -rX:Y FOO basename(FOO)
> >
> > If basename(FOO) isn't a file or dir within '.', then error.
>
>
> what if you run:
> % svn merge http://.../foo_branch/foo.c http://.../bar_branch/foo.c
>
> (and foo.c is a file within '.') ?
Yeah, I guess that would be the same the last case above.
You'll see in the code, that wc-paths just get converted to URLs
regardless, and 2 URLs are always compared for diffs. So you should
get that behavior automatically.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 7 16:32:40 2003