> > > * 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.
well, in the former case, the two sourcepaths are the same (only the
revnum is different). in the latter example, the two sourcepaths are
different - only the basenames are the same. still, it seems like a
fairly common case to want to be able to handle, and off the top of my
head i can't think of a reason not to treat it the same way.
i've got a few lines in clients/cmdline/merge-cmd.c which seem at first
glance to be doing the job. i'm probably missing something; but before i
go any further: do you think that's the right place to solve this problem?
I thought about trying to handle the case at a lower layer, but it seems
like a very client-specific issue, e.g. a GUI client might not even run
into this issue, or might handle it on the GUI side.
-brian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 7 18:32:50 2003