/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: Canonical.com Patch Queue Manager
  • Date: 2007-11-26 20:55:33 UTC
  • mfrom: (1551.19.9 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20071126205533-5vehpxjf6uk2n8fy
Revert of single files in deleted directories works

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1489
1489
                          _mover=self.ExceptionFileMover(bad_target='d'))
1490
1490
        self.failUnlessExists('a')
1491
1491
        self.failUnlessExists('a/b')
 
1492
 
 
1493
    def test_resolve_no_parent(self):
 
1494
        wt = self.make_branch_and_tree('.')
 
1495
        tt = TreeTransform(wt)
 
1496
        self.addCleanup(tt.finalize)
 
1497
        parent = tt.trans_id_file_id('parent-id')
 
1498
        tt.new_file('file', parent, 'Contents')
 
1499
        resolve_conflicts(tt)