← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

  • Committer: Robert Collins
  • Date: 2005-11-06 00:12:04 UTC
  • mfrom: (1457.1.16)
  • Revision ID: robertc@robertcollins.net-20051106001204-b8c6d5169308d7e6
All pending merges operations from Branch are now on WorkingTree.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/teststatus.py
47
47
 
48
48
        tof = StringIO()
49
49
        self.build_tree(['hello.c', 'bye.c'])
50
 
        b.add_pending_merge('pending@pending-0-0')
 
50
        b.working_tree().add_pending_merge('pending@pending-0-0')
51
51
        show_status(b, to_file=tof)
52
52
        tof.seek(0)
53
53
        self.assertEquals(tof.readlines(),