← 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 at utoronto
  • Date: 2005-09-04 02:59:56 UTC
  • mfrom: (1172)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050904025956-776ba4f07de97700
Merged mpool's latest changes (~0.0.7)

Show diffs side-by-side

added added

removed removed

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