← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testworkingtree.py

  • Committer: Robert Collins
  • Date: 2005-11-05 14:48:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1503.
  • Revision ID: robertc@robertcollins.net-20051105144839-0778253797be08ec
Replace the WorkingTree.revert method algorithm with a call to merge_inner.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testworkingtree.py
140
140
        self.check_file_contents('hello.txt', 'initial hello')
141
141
        self.check_file_contents('hello.txt~', 'new hello')
142
142
 
143
 
        # reverting again clobbers the backup
 
143
        # reverting again does not clobber the backup
144
144
        wt.revert(['hello.txt'])
145
145
        self.check_file_contents('hello.txt', 'initial hello')
146
 
        self.check_file_contents('hello.txt~', 'initial hello')
 
146
        self.check_file_contents('hello.txt~', 'new hello')