← 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 backup-names into orphan-non-versioned-files

Show diffs side-by-side

added added

removed removed

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