mercurial/crew at 10264: 4 new changesets (3 stable): eb243551cbd8 is probably wrong

[Patrick Mézard]

> http://hg.intevation.org/mercurial/crew/rev/eb243551cbd8
> changeset:   10262:eb243551cbd8
> branch:      stable
> user:        Matt Mackall <mpm at selenic.com>
> date:        Tue Jan 19 22:20:05 2010 -0600
> summary:     copies: speed up copy detection

Trying to rebase 15 or 20 revision involving at least one file which was moved twice in difference locations, I had a really strange merge request which really made no sense. So I backed out eb243551cbd8 and retried the rebase and this time I got something like (shell output is a little garbled):

local changed foobar which remote deleted
... (c)hanged version or (d)elete? c

were "foobar" is the file I was asked to merge in the first run. Obviously I answered incorrectly to this question and ended with an additional file at the end of the rebase. But except for this file, rebase tip was identical to tip before rebase, which is expected with hgsubversion.

So I think something is wrong with eb243551cbd8. In theory, I have a copy of my local clone after the merge failure so I should be able to reproduce it later.

--
Patrick Mézard