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

merge_tests 27 obsolete?

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Fri, 28 Nov 2008 00:27:01 +0100

Hi all,

we're fixing the way tree-conflicts treat obstructions, which causes
merge_tests.py 27 to fail (among others).

But I find that this test wants lenient behaviour that shouldn't be allowed:

A directory exists locally and is unversioned.
Merge adds a directory of the same name.

This is currently allowed. See also issue #2222, there is a fix for this
explicit situation in r13358.

But I don't get it. If the directory is obstructed, it's obstructed! Why
should this be an exception? Shouldn't it then first take a look whether
that directory is empty or something? I'd say get rid of this.

If an unversioned directory obstructs a merge, svn should say so and skip
it, as with any other obstructions. Finish en klaar.


Received on 2008-11-28 00:27:26 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.