[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: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2004-01-01 13:41:58 CET

On Mon, 2003-12-29 at 18:38, John Szakmeister wrote:
> On Saturday 20 December 2003 07:28, John Szakmeister wrote:
> > if (! strcmp (targetpath, ""))
> > {
["If source1 and source2 are files with the same basename, then..."]
> > targetpath = sp1_basename;

> The current algorithm doesn't always pick the correct target...

I haven't seen the users thread; can you elaborate on that? It would
seem to depend on what "correct" is.

> At the very least, I think that if I put '.' as the target for the
> merge operation on the command line, that we should treat that as an explicit
> target and not try to compute an implicit target.

Agreed, but...

> I think this gives users a more reasonable workaround than having to
> type 'svn merge URL1 URL2 ../name_of_current_directory'.

I'm missing something. If URL1 and URL2 are both files, when would this
ever produce anything but an error?

(It certainly seems more appropriate to generate an error on "svn merge
url-of-file1 url-of-file2 ." than it is to try to merge into
basename-of-file1, so I agree that it's a bug. But more of an
"unpredictable behavior in the corner case" bug than a usability bug.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 1 13:42:34 2004

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