← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revert.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revert.py
32
32
        source_tree.commit('added dir')
33
33
        target_tree.lock_write()
34
34
        self.addCleanup(target_tree.unlock)
35
 
        merge.merge_inner(target_tree.branch, source_tree.basis_tree(), 
 
35
        merge.merge_inner(target_tree.branch, source_tree.basis_tree(),
36
36
                          target_tree.basis_tree(), this_tree=target_tree)
37
37
        self.failUnlessExists('target/dir')
38
38
        self.failUnlessExists('target/dir/contents')
67
67
        tree.commit('add new_file')
68
68
        tree.revert(old_tree=basis_tree)
69
69
        self.failIfExists('tree/new_file')
70
 
        
 
70
 
71
71
        # files should be deleted if their changes came from merges
72
72
        merge_target.merge_from_branch(tree.branch)
73
73
        self.failUnlessExists('merge_target/new_file')