Rev 5416: Merge cleanup into backup-names in file:///home/vila/src/bzr/bugs/323111-orphans/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/323111-orphans/

------------------------------------------------------------
revno: 5416 [merge]
revision-id: v.ladeuil+lp at free.fr-20100909195111-xta4ws1g50jluhhb
parent: v.ladeuil+lp at free.fr-20100909130255-ppyxbb3q137skxbf
parent: v.ladeuil+lp at free.fr-20100909195057-hkvsb6k9zh1sqq7e
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: backup-names
timestamp: Thu 2010-09-09 21:51:11 +0200
message:
  Merge cleanup into backup-names
modified:
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
-------------- next part --------------
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2010-09-07 10:53:24 +0000
+++ b/bzrlib/tests/test_transform.py	2010-09-09 19:50:57 +0000
@@ -821,9 +821,13 @@
         parent = tt.trans_id_file_id('parent-id')
         tt.new_file('file', parent, 'Contents')
         raw_conflicts = resolve_conflicts(tt)
+        # Since the directory doesn't exist it's seen as missing to resolve
+        # create a conflict asking for it to be created.
         self.assertLength(1, raw_conflicts)
         self.assertEqual(('missing parent', 'Created directory', 'new-1'),
                          raw_conflicts.pop())
+        # apply fail since the missing directory doesn't exist
+        self.assertRaises(errors.NoFinalPath, tt.apply)
 
     def test_moving_versioned_directories(self):
         create, root = self.get_transform()