Blair Zajac <blair@orcaware.com> writes:
> If you try doing something stupid like this with using an odd revision
> range, then I get a warning:
>
> svn co http://svn.collab.net/repos/svn/trunk/subversion/libsvn_wc
> cd libsvn_wc
> svn merge . -r 1300:1000
>
> [...]
>
> svn_error: #21086 : <RA layer request failed>
> PROPFIND of /repos/svn/trunk/subversion/libsvn_wc/get_editor.c: 404 Not Found
>
> Should svn protect people from doing something like this or have a better
> message?
Nah. What exactly would it be "protecting" against? Maybe that's the
merge someone really wants to do :-). IMHO merge should error as
little as possible, certainly never when reasonable non-error
behaviors are available.
In this case, I guess the Truly Right Thing would be for Subversion to
figure out that `get_editor.c' is now called `update_editor.c', and
apply the change to update_editor.c. Implementing that may take a
while though. Hmmm, fall back to the Next Most Right Thing...
The Next Most Right Thing is to put both "get_editor.c.r1000" and
"get_editor.c.r1300" in the directory, indicate this in the output,
and let the user sort things out. After all, the problem is that of
the three files necessary for a 3-way diff, one is missing. So give
the user the other two and let her find the third. :-)
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 29 05:27:26 2002