Re: issue #785 (was Re: wanted: nibble-sized coding task)

Brian Denny <brian@briandenny.net> writes:

> so, #785 in issuezilla says: "if i cd into libsvn_wc and run
> 'svn merge -rX:Y update_editor.c'
>
> Then it's obvious what i want to happen..."
>
> so far, so good.
> my question is, what if you run:
> 'svn merge -rX:Y http://path/to/update_editor.c'
>
> ?
>
> presumably you could do this outside of any working copy, in which case
> i would expect it to give an error; but what if you're in a working copy
> that contains that file? should svn figure that out and merge the
> changes into your local file?

Yes.

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 6 16:57:34 2003