Rev 5415: Fix typo in the comment. in file:///home/vila/src/bzr/bugs/323111-orphans/

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu Sep 16 10:15:48 BST 2010


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

------------------------------------------------------------
revno: 5415
revision-id: v.ladeuil+lp at free.fr-20100916091547-hyd04ahwiv3prmyd
parent: v.ladeuil+lp at free.fr-20100909195057-hkvsb6k9zh1sqq7e
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Thu 2010-09-16 11:15:47 +0200
message:
  Fix typo in the comment.
-------------- 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())



More information about the bazaar-commits mailing list