latest test script
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py	2007-12-10 16:39:00 +0000
+++ bzrlib/tests/blackbox/test_commit.py	2008-08-12 08:37:32 +0000
@@ -567,3 +567,129 @@
             retcode=3)
         self.assertContainsRe(err,
             r'^bzr: ERROR: Cannot lock.*readonly transport')
+
+    def test_add_directory_and_rename_into_bug_256409_2(self):
+        # https://bugs.launchpad.net/bzr/+bug/256409
+        # corrupt deltas generated at commit...
+        tree = self.make_branch_and_tree('.')
+        rev1 = "rev1"
+        rev2 = "rev2"
+        basis_string = ('<inventory format="5" revision_id="rstaudinger@meqbuq-20080703224820-8k0vqs92cnxmhhbg">\n'
+            '<file file_id="authors-20080630152523-k74ehpkuf0lttzfl-1" name="AUTHORS" revision="rev1" text_sha1="3cac852421abbeb59f7e29bf69b6604a61b6ccfd" text_size="37" />\n'
+            '<file file_id="copying-20080630152523-k74ehpkuf0lttzfl-2" name="COPYING" revision="rev1" text_sha1="dd4547c72e04fd16fd675556993abb945491a69c" text_size="26428" />\n'
+            '<file file_id="changelog-20080630152523-k74ehpkuf0lttzfl-3" name="ChangeLog" revision="rev1" text_sha1="da39a3ee5e6b4b0d3255bfef95601890afd80709" text_size="0" />\n'
+            '<file file_id="install-20080630152523-k74ehpkuf0lttzfl-4" name="INSTALL" revision="rev1" text_sha1="e6ea7e38b35a5876da160c67dbdf349649755142" text_size="9512" />\n'
+            '<file file_id="makefile.am-20080630152523-k74ehpkuf0lttzfl-5" name="Makefile.am" revision="rev1" text_sha1="9a8307720305f34ebcb5b10d88c3bcb1b55b47cc" text_size="177" />\n'
+            '<file file_id="news-20080630152523-k74ehpkuf0lttzfl-6" name="NEWS" revision="rev1" text_sha1="da39a3ee5e6b4b0d3255bfef95601890afd80709" text_size="0" />\n'
+            '<file file_id="readme-20080630152523-k74ehpkuf0lttzfl-7" name="README" revision="rev1" text_sha1="c6922bd6b9d2be14fc37574a3f319db47fb3d3e4" text_size="5792" />\n'
+            '<file executable="yes" file_id="autogen.sh-20080630152523-k74ehpkuf0lttzfl-8" name="autogen.sh" revision="rev1" text_sha1="4bd6a59b990f9b8602c6811d09f7011381dc1f14" text_size="4348" />\n'
+            '<file file_id="configure.in-20080630152523-k74ehpkuf0lttzfl-9" name="configure.in" revision="rev1" text_sha1="c0b4ecfa8bbeca08e54c5c92cca194cc5354ee89" text_size="1135" />\n'
+            '<directory file_id="src-20080630152523-k74ehpkuf0lttzfl-10" name="src" revision="rev1" />\n'
+            '<file file_id="makefile.am-20080630152523-k74ehpkuf0lttzfl-12" name="Makefile.am" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="c79b9f6ee3d5e190159bded594a3c57bac99cb2d" text_size="389" />\n'
+            '<file file_id="cssborder.c-20080702140619-zp6u6cvl3fug2tnh-1" name="css-border.c" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="931d11b533d9dcf8aa845b266399aa0103456101" text_size="5210" />\n'
+            '<file file_id="cssborder.h-20080702140622-1a1l73xns7a30ji6-1" name="css-border.h" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="c2013976f4382623866b631d52f94476384d6253" text_size="1879" />\n'
+            '<file file_id="csscolor.h-20080702140622-1a1l73xns7a30ji6-2" name="css-color.h" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="dba80fd0561a445bdde9cd88f384d16b4d01e458" text_size="943" />\n'
+            '<file file_id="cssgtk.c-20080702140619-zp6u6cvl3fug2tnh-2" name="css-gtk.c" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="ef88dca3b2e001a41bc69ef38ba1592a6c1cebc0" text_size="9313" />\n'
+            '<file file_id="cssgtk.h-20080702140622-1a1l73xns7a30ji6-3" name="css-gtk.h" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="5572dc347dd7e2307fc7abf44ceeaef119652002" text_size="1286" />\n'
+            '<file file_id="cssrcstyle.c-20080630152523-k74ehpkuf0lttzfl-13" name="css-rc-style.c" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="20ac1c12cfe7e81b7ca3c82d3a8814428d31b742" text_size="2880" />\n'
+            '<file file_id="cssrcstyle.h-20080630152523-k74ehpkuf0lttzfl-14" name="css-rc-style.h" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="38a6e184b56632dc911abdb4e4618bec16ec0993" text_size="1758" />\n'
+            '<file file_id="cssstyle.c-20080630152523-k74ehpkuf0lttzfl-15" name="css-style.c" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="3808fbd3e17f26af71440549fc09de54b77aa41d" text_size="6183" />\n'
+            '<file file_id="cssstyle.h-20080630152523-k74ehpkuf0lttzfl-16" name="css-style.h" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="35d7eb6e2b4f29a0dae062a8f7bfd51b0525a90d" text_size="1698" />\n'
+            '<file file_id="csstheme.c-20080630152523-k74ehpkuf0lttzfl-17" name="css-theme.c" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="5a7dd202fe2bece48b4d4a0676329ad707b039ee" text_size="1419" />\n'
+            '<file file_id="css.h-20080703172827-bor6ze7zh2q5ix0e-1" name="css.h" parent_id="src-20080630152523-k74ehpkuf0lttzfl-10" revision="rev1" text_sha1="9d0c81bd3685f206975fc2183735b752723e47d4" text_size="946" />\n'
+            '<directory file_id="tests-20080703135019-lso2pyy41scmv466-1" name="tests" revision="rev1" />\n'
+            '<file file_id="drawing.c-20080703141534-hfdtbme1gtdl6g10-1" name="drawing.c" parent_id="tests-20080703135019-lso2pyy41scmv466-1" revision="rev1" text_sha1="97c51068e48cc6343b454e2759fe6b0d59ccf602" text_size="2837" />\n'
+            '<directory file_id="theme-20080630152523-k74ehpkuf0lttzfl-11" name="theme" revision="rev1" />\n'
+            '<file file_id="makefile.am-20080630152523-k74ehpkuf0lttzfl-18" name="Makefile.am" parent_id="theme-20080630152523-k74ehpkuf0lttzfl-11" revision="rev1" text_sha1="8c656ad2c66eabb4033b62854fd11624fc9d60e5" text_size="15" />\n'
+            '<directory file_id="null-20080630152523-k74ehpkuf0lttzfl-19" name="null" parent_id="theme-20080630152523-k74ehpkuf0lttzfl-11" revision="rev1" />\n'
+            '<file file_id="makefile.am-20080630152523-k74ehpkuf0lttzfl-20" name="Makefile.am" parent_id="null-20080630152523-k74ehpkuf0lttzfl-19" revision="rev1" text_sha1="8abceed311f42605d4f26109947ea7379abf9114" text_size="18" />\n'
+            '<directory file_id="gtk2.0-20080630152523-k74ehpkuf0lttzfl-21" name="gtk-2.0" parent_id="null-20080630152523-k74ehpkuf0lttzfl-19" revision="rev1" />\n'
+            '<file file_id="makefile.am-20080630152523-k74ehpkuf0lttzfl-22" name="Makefile.am" parent_id="gtk2.0-20080630152523-k74ehpkuf0lttzfl-21" revision="rev1" text_sha1="4ced22b37638352dc5d5d2b4fc9814fa6ce0e2b1" text_size="89" />\n'
+            '<file file_id="gtkrc-20080630152523-k74ehpkuf0lttzfl-23" name="gtkrc" parent_id="gtk2.0-20080630152523-k74ehpkuf0lttzfl-21" revision="rev1" text_sha1="a4c53a865c62ed974f855fe49c402fc1b954063a" text_size="123" />\n'
+            '</inventory>\n')
+        basis_inv = tree.branch.repository._serializer.read_inventory_from_string(basis_string)
+        # create a basis tree
+        self.build_tree([
+            'AUTHORS',
+            'COPYING',
+            'ChangeLog',
+            'INSTALL',
+            'NEWS',
+            'README',
+            'Makefile.am',
+            'autogen.sh',
+            'configure.in',
+            'src/',
+            'src/Makefile.am',
+            'src/css-border.c',
+            'src/css-border.h',
+            'src/css-color.h',
+            'src/css-gtk.c',
+            'src/css-gtk.h',
+            'src/css-rc-style.c',
+            'src/css-rc-style.h',
+            'src/css-style.c',
+            'src/css-style.h',
+            'src/css-theme.c',
+            'src/css.h',
+            'tests/',
+            'tests/drawing.c',
+            'theme/',
+            'theme/Makefile.am',
+            'theme/null/',
+            'theme/null/Makefile.am',
+            'theme/null/gtk-2.0/',
+            'theme/null/gtk-2.0/Makefile.am',
+            'theme/null/gtk-2.0/gtkrc',
+            ])
+        # set the inventory we want to commit
+        tree._write_inventory(basis_inv)
+        tree.commit('first post', rev_id=rev1)
+        self.run_bzr('mkdir cbd')
+        self.run_bzr('mv ../src/css-border.c ../src/css-border.h .', working_dir='cbd')
+        self.run_bzr('mv ../src/css-color.h .', working_dir='cbd')
+        self.run_bzr('mv ../src/css-gtk.c ../src/css-gtk.h .', working_dir='cbd')
+        self.run_bzr('mv ../src/css.h .', working_dir='cbd')
+        """
+[19361] 2008-07-04 13:28:53.817 INFO: modified Makefile.am
+[19361] 2008-07-04 13:28:53.818 INFO: added cbd
+[19361] 2008-07-04 13:28:53.820 INFO: modified configure.in
+[19361] 2008-07-04 13:28:53.824 INFO: modified and renamed src/css-border.c => cbd/css-border.c
+[19361] 2008-07-04 13:28:53.826 INFO: modified and renamed src/css-border.h => cbd/css-border.h
+[19361] 2008-07-04 13:28:53.828 INFO: renamed src/css-color.h => cbd/css-color.h
+[19361] 2008-07-04 13:28:53.831 INFO: renamed src/css-gtk.c => cbd/css-gtk.c
+[19361] 2008-07-04 13:28:53.833 INFO: modified and renamed src/css-gtk.h => cbd/css-gtk.h
+[19361] 2008-07-04 13:28:53.834 INFO: renamed src/css.h => cbd/css.h
+[19361] 2008-07-04 13:28:53.835 INFO: modified src/Makefile.am
+[19361] 2008-07-04 13:28:53.838 INFO: modified tests/drawing.c
+[19361] 2008-07-04 13:28:53.839 INFO: modified theme/Makefile.am
+[19361] 2008-07-04 13:28:53.841 INFO: modified theme/null/Makefile.am
+[19361] 2008-07-04 13:28:53.842 INFO: modified theme/null/gtk-2.0/Makefile.am
+0.334  added revision_id {rstaudinger@meqbuq-20080704112853-mzq042mhe9mtnjma}
+[19361] 2008-07-04 13:28:53.886 INFO: Committed revision 11.
+0.341  return code 0
+"""
+        # new content changed 
+        self.build_tree_contents([
+            ('configure.in', 'new'),
+            ('cbd/css-border.c', 'new'),
+            ('cbd/css-border.h', 'new'),
+            ('cbd/css-gtk.h', 'new'),
+            ('Makefile.am', 'new'),
+            ('src/Makefile.am', 'new'),
+            ('theme/Makefile.am', 'new'),
+            ('theme/null/Makefile.am', 'new'),
+            ('theme/null/gtk-2.0/Makefile.am', 'new'),
+            ('tests/drawing.c', 'new')])
+        self.run_bzr('commit -m message')
+        tree = tree.bzrdir.open_workingtree()
+        rev2 = tree.branch.last_revision()
+        self.run_bzr('check')
+        tree.lock_read()
+        t = tree.branch.repository.get_transaction()
+        r = tree.branch.repository
+        knit = r.weave_store.get_weave(tree.path2id('cbd'), t)
+        self.assertEqual(set([rev2]), set(knit.versions()))
+        # final smoking gun test
+        self.run_bzr('branch . foo')
+