/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Vincent Ladeuil
  • Date: 2010-09-16 09:15:47 UTC
  • mto: (5409.5.7 backup-names)
  • mto: This revision was merged to the branch mainline in revision 5504.
  • Revision ID: v.ladeuil+lp@free.fr-20100916091547-hyd04ahwiv3prmyd
Fix typo in the comment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
821
821
        parent = tt.trans_id_file_id('parent-id')
822
822
        tt.new_file('file', parent, 'Contents')
823
823
        raw_conflicts = resolve_conflicts(tt)
824
 
        # Since the directory doesn't exist it's seen as missing to resolve
825
 
        # create a conflict asking for it to be created.
 
824
        # Since the directory doesn't exist it's seen as 'missing'.  So
 
825
        # 'resolve_conflicts' create a conflict asking for it to be created.
826
826
        self.assertLength(1, raw_conflicts)
827
827
        self.assertEqual(('missing parent', 'Created directory', 'new-1'),
828
828
                         raw_conflicts.pop())