[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 301 error on merge

From: John Szakmeister <john_at_szakmeister.net>
Date: 2004-01-03 13:34:06 CET

On Thursday 01 January 2004 12:24, Greg Hudson wrote:
> On Thu, 2004-01-01 at 09:47, John Szakmeister wrote:
> > > ["If source1 and source2 are files with the same basename, then..."]
>
> Ah, I understand now. The actual test is:
>
> If source1 and source2 have the same basename and that basename
> maps to a file in the wc, then use that basename as the implicit
> target.
>
> which is a terrible test. I can see why you might want to move it into
> libsvn_client, where one could test the URLs rather than the working
> copy.

Yep. But I think even if we move the test into libsvn_client, that we still
face some problems. We can never be absolutely sure what the target of the
merge operation is supposed to be, unless it is specified.

-John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jan 3 13:36:50 2004

This is an archived mail posted to the Subversion Dev mailing list.