[MERGE] Don't traceback when adding files to a deleted root (abentley, #210092)

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

This patch fixes #210092, which occurs when merge tries to add files to
a root directory that has been deleted.  This patch changes the handling
so that if files are added to a deleted root, they are moved into the
current root.

The only way of deleting a root directory that I'm aware of is with the
"bzr split" command.

$ bzr init foo --rich-root-pack
$ bzr mkdir foo/bar
added foo/bar
$ bzr commit -m baz foo
Committing to: /home/abentley/foo/
added bar
Committed revision 1.
$ bzr split foo/bar
$ bzr status --short foo/bar
    /
- -D  /

bar is now a separate tree, and from its perspective, foo has been
deleted.  (And it looks like status could use some love.)

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH9bBa0F+nu1YWqI0RAnAdAJ9XHNgdW28tTX6aNWuoqb5Bu3/2XQCeMFJp
LCecKj6H1YshjXiL5FHhJRM=
=cj++
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Aaron's mergeable stuff-1923.patch
Type: text/x-diff
Size: 7705 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080404/25faf385/attachment.bin