/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/blackbox/test_merge.py

  • Committer: Martin Albisetti
  • Date: 2008-04-04 01:06:44 UTC
  • mfrom: (3331 +trunk)
  • mto: (3350.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 3351.
  • Revision ID: argentina@gmail.com-20080404010644-3vurp3zln4uzu9nv
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
491
491
        this_tree.lock_read()
492
492
        self.addCleanup(this_tree.unlock)
493
493
        self.assertEqual([],
494
 
                         list(this_tree._iter_changes(this_tree.basis_tree())))
 
494
                         list(this_tree.iter_changes(this_tree.basis_tree())))