← 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-10-24 08:53:06 UTC
  • mfrom: (1185.16.90)
  • Revision ID: robertc@robertcollins.net-20051024085306-a3173edd40c87abd
merge from martin

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
        # must be long to make sure we see elipsis at the end
117
118
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah"
118
119
                 "blah blah blah blah blah blah blah")
119
120
        merge(["./branch", -1], [None, None], this_dir = './copy')