← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Aaron Bentley
  • Date: 2007-11-23 14:47:18 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 3028.
  • Revision ID: abentley@panoramicfeedback.com-20071123144718-ax42ydiszzmfgjp4
Revert doesn't crash restoring a file from a deleted directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1469
1469
                          _mover=self.ExceptionFileMover(bad_target='d'))
1470
1470
        self.failUnlessExists('a')
1471
1471
        self.failUnlessExists('a/b')
 
1472
 
 
1473
    def test_resolve_no_parent(self):
 
1474
        wt = self.make_branch_and_tree('.')
 
1475
        tt = TreeTransform(wt)
 
1476
        self.addCleanup(tt.finalize)
 
1477
        parent = tt.trans_id_file_id('parent-id')
 
1478
        tt.new_file('file', parent, 'Contents')
 
1479
        resolve_conflicts(tt)