← 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-10-17 17:49:57 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: abentley@panoramicfeedback.com-20051017174957-9669ee80955f0adf
Fixed selftest bug for users with short ids

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/teststatus.py
114
114
        assert (message.startswith("pending merges:\n")), message
115
115
        assert (message.endswith("Empty commit 2\n")), message 
116
116
        b_2.commit("merged")
117
 
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah")
 
117
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah"
 
118
                 "blah blah blah blah blah blah blah")
118
119
        merge(["./branch", -1], [None, None], this_dir = './copy')
119
120
        message = self.status_string(b_2)
120
121
        assert (message.startswith("pending merges:\n")), message