# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bialix@ukr.net-20070920093025-cy85a36ry1xad131
# target_branch: file:///E:/Bazaar/mydev/bzr.dev/
# testament_sha1: ac5d6cf0e3d5fba6608cd532b6ad958969e0551e
# timestamp: 2007-09-20 12:37:27 +0300
# base_revision_id: pqm@pqm.ubuntu.com-20070919101753-4e8wasie12tewyjv
# 
# Begin patch
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py	2007-09-18 01:29:59 +0000
+++ bzrlib/tests/blackbox/test_commit.py	2007-09-20 09:30:25 +0000
@@ -520,3 +520,21 @@
         last_rev = tree.branch.repository.get_revision(tree.last_revision())
         properties = last_rev.properties
         self.assertEqual('John Doe', properties['author'])
+
+    def test_partial_commit_with_renames_in_tree(self):
+        # this test illustrate bug #140419
+        t = self.make_branch_and_tree('.')
+        self.build_tree(['dir/', 'dir/a', 'test'])
+        t.add(['dir/', 'dir/a', 'test'])
+        t.commit('initial commit')
+        # important part: file dir/a should change parent
+        # and should appear before old parent
+        # then during partial commit we have error
+        # parent_id {dir-XXX} not in inventory
+        t.rename_one('dir/a', 'a')
+        self.build_tree_contents([('test', 'changes in test')])
+        # check for error
+        self.run_bzr_error(['bzr: ERROR: parent_id .+ not in inventory'],
+                           'commit test -m "partial commit"')
+        self.expectFailure('Bug #140419',
+                           self.run_bzr, 'commit test -m "partial commit"')

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT2jjQMAAgR/gEQQAIBZ7///
cySQSr////pQBLrWeAc3N2OtrYIJJEaI0YgZNTCMmNFNpkhtQeo0DQBpqDSaNU9NQ0G0hoD1DI0G
hkNqbU0AJFNIp4JiRpp5Eyj1DQaaaNAADRoDmmJkyaMJgmJpgEwCGCMCMAkkAQRgIoGmjQANANGg
NA0mksuS7PefPWa6bfxUfeW+FFkju5i5WjVbdFkQlMcaJ4qEIUaA+p8VgmShSdKjpjYb06kHyPZ2
saKqvNM3QWNtAoeS9WQtFNbnRnYLpxCB/ueMjGVEKNxiW5YaVPhTTJKXRiEuj18u6vJZJE5eVwwC
fJlelqGVonKDTu8eWI8kS6yR6CDGr6M6pFEDGblTPfGrbTHX9WDNnPHHOSrYaf5iX9KYs/GqrjnF
gfm6VXPRLE4dyiCybFyTCBuUCowS3z+KMOqaGvdh60gaK6DMWvQFOQYmwifgEOFUkakWJkyp6mLi
MrXrnjyMSaK5oXRc6kHF8YxyCI8XT5ly4E8SOb5lqwpu41JvTk+wqZny4idPeQQnCqW7XjjIM3it
TTnMYLiYzkOUBWDxanAfIUJDjOzY0JCtLjew+8nR5sWrtFFLA3Jew3Fdr+fQcYmKiNkYZaicQJnG
A6hffpQ1LCjE1kQMsKixuEMt4y1zLE+WTnE3R3FxLgLgYxLKUsKmJJOiXNRlcE2FiwFbAirz/OE4
z18d004qhsEYEckhQAsRTnBITQRwX/sqKajzX0eScOUV5GvYFLGusTGianXlQk6qsjWa9m754tZj
vY5hmB4NC7MNZevPG2CY3GTREUzeUzYUOWyxrvGXTWHQat4twcDfaW+BbXtE845cBoLDsDdbzQs4
ZnRlvrPYQiv8sKS/qvK7iuc9RWXCosORmKHddZrTN1aqBw0nROsPel5MwsGEQxDFKc4Fi8yAUKAy
QDCvKEhMGmLc+PHBn3i8RiOIFFJN4T2liH2lhTq0P1KHMdexqyo7bN9m3bfxldfcZYSYU0nhYVGE
GV3jwJC9mpbW+eMIcK8A51uJaWI9/DilLGMyKkUuRIYHwaw774UWFKghNkAmAesOxyjxkSXiajvL
CYqp67XUMTMue9RFnaKXdPecjzBldcpvCVA7kxXpa+J25pcSpNpcWBdPGORJ2hfm2/zzkyNBpwJ0
sfcBnSN2J2hKeV3vWUNMwpsk8JpuMuzE8nbF0wSmBGFe5e9vSVXWLmxVgdmys1AqgVHAmRhJTgMB
hGwoKFAMmWgQPL3RndQeSZUk5DMKScjvcuVa6JKVzJcPHCSVRtYOC3Oz0TFGkzZKBV11p57TBAve
cwPflr2KW6S3XD5lWK0ztkN82WaTFQQ3MOM5ZYyDjtdgjR4dWDUXU14WqdtEwzU1bSMJEmXEg9on
vnpskxj4HR2rHtlksSZerAIrVgBSGl7i4qskXk7EVOYOSUqCE9PVjWcOJVp7SuVVM6L3ijzK3dm5
9iZfokXaWoagvC1D1BIJtUNYQXrJdO7rYcEtB0VHGNT03G/19idHYByWLFhiVGJKcTzYypIa3MMl
nE+1+9XKWJcajn6/8XckU4UJA9o40DA=