[PATCH] merge: do not try to delete several times the same directory

[Matt Mackall]

On Sun, 2010-11-07 at 21:16 +0900, Nicolas Dumazet wrote:
> # HG changeset patch
> # User Nicolas Dumazet <nicdumz.commits at gmail.com>
> # Date 1289132163 -32400
> # Branch stable
> # Node ID 3b55683cd3e487e958e8099e3ae023e03e0a97c8
> # Parent  6f5498bfa7e5dd80cc29521d7fce95c6c5465650
> merge: do not try to delete several times the same directory
> 
> util.unlink is a nice utility, but does a bit too much for merges.
> For instance, if we delete 100 files in the same directory, it will
> try to delete 99 times the base directory...

This will cause trouble if we delete /foo/bar and then try to create
foo.

-- 
Mathematics is the supreme nostalgia of our time.