← 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-17 23:13:00 UTC
  • mto: This revision was merged to the branch mainline in revision 1462.
  • Revision ID: robertc@robertcollins.net-20051017231300-e1c9e931bcfacd6a
Branch.open_containing now returns a tuple (Branch, relative-path).

This allows direct access to the common case of 'get me this file
from its branch'. (Robert Collins)

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
118
 
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah"
119
 
                 " blah blah blah blah blah blah bleh")
 
117
        b.commit("Empty commit 3 blah blah blah blah blah blah blah blah blah")
120
118
        merge(["./branch", -1], [None, None], this_dir = './copy')
121
119
        message = self.status_string(b_2)
122
120
        assert (message.startswith("pending merges:\n")), message