← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

  • Committer: Aaron Bentley
  • Date: 2005-08-26 16:32:50 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: abentley@panoramicfeedback.com-20050826163250-37eddf064f71ed0f
Status command shows pending merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/teststatus.py
39
39
 
40
40
        tof = StringIO()
41
41
        self.build_tree(['hello.c', 'bye.c'])
 
42
        b.add_pending_merge('pending@pending-0-0')
42
43
        show_status(b, to_file=tof)
43
44
        tof.seek(0)
44
45
        self.assertEquals(tof.readlines(),
45
46
                          ['unknown:\n',
46
47
                           '  bye.c\n',
47
48
                           '  hello.c\n',
 
49
                           'pending merges:\n',
 
50
                           '  pending@pending-0-0\n'
48
51
                           ])
49
52