[MERGE] Fix update_basis_by_delta when renaming dir to root

[John Arbash Meinel]

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

It turns out there was a small bug in the DirState.update_basis_by_delta
code. Renaming a directory to become the root would not properly handle
the children. Specifically instead of renaming "dir/file" => "file" it
would try to do "dir/file" => "/file".

This patch adds workingtree tests for the permutation, and fixes the bug
in DirState.

This was exposed by the nested-trees code, since "split" likes to move
things into the root dir.

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

iD8DBQFH0DbdJdeBCYSNAAMRApUFAJ4j4uiPtoBMiJ22jv3oTSJRnq1YkwCfTa7/
FMOVz6QR+6PLMtO8CmGDHrE=
=qWXJ
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_update_to_root.patch
Type: text/x-diff
Size: 6437 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080306/a9280e4e/attachment.bin