← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Merge deprecate-get-backup-name into orphan-config-option

Show diffs side-by-side

added added

removed removed

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