← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_too_much.py

  • Committer: Robert Collins
  • Date: 2006-02-11 11:58:06 UTC
  • mto: (1534.1.22 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060211115806-732dabc1e35714ed
Give format3 working trees their own last-revision marker.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
407
407
        self.runbzr('merge ../b -r last:1')
408
408
        self.check_file_contents('goodbye', 'quux')
409
409
        # Merging a branch pulls its revision into the tree
410
 
        a = WorkingTree('.')
 
410
        a = WorkingTree.open('.')
411
411
        b = Branch.open('../b')
412
412
        a.branch.repository.get_revision_xml(b.last_revision())
413
413
        self.log('pending merges: %s', a.pending_merges())