revert failure case

[Martin Pool]

I just tried to revert a merge which had, amongst other things, renamed
bzrlib.selftest to bzrlib.tests.  (The test itself went fine once I
merged aaron's latest goodness.)

The merge fails with this error:

bzr: ERROR: bzrlib.changeset.MissingForRename: Attempt to move missing path /home/mbp/work/bzr/merge-trial/./bzrlib/tests/blackbox to /home/mbp/work/bzr/merge-trial/bzr-tree-change/54
  at /home/mbp/lib/python/bzrlib/changeset.py line 1169
  in missing_for_rename

It has already renamed the directory back to selftests, which is why it
fails.  I should like to get some kind of test case that reproduces this
and guards against regression.

The half-reverted branch is here:

  http://people.ubuntu.com/~mbp/bzr-testdata/breaks-revert-20051125.tar.bz2

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051125/a768fe59/attachment.pgp