Rev 5418: 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: 5418 [merge]
revision-id: v.ladeuil+lp at free.fr-20100916091601-lxu7a33m3a3vb8hp
parent: v.ladeuil+lp at free.fr-20100909202015-uwo1zl3ghnw1ogkk
parent: v.ladeuil+lp at free.fr-20100916091547-hyd04ahwiv3prmyd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: backup-names
timestamp: Thu 2010-09-16 11:16:01 +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-09 19:50:57 +0000
+++ b/bzrlib/tests/test_transform.py	2010-09-16 09:15:47 +0000
@@ -821,8 +821,8 @@
         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.
+        # Since the directory doesn't exist it's seen as 'missing'.  So
+        # 'resolve_conflicts' 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())