← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Merged the mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
242
242
        >>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
243
243
        >>> br1.missing_revisions(br2)
244
244
        Traceback (most recent call last):
245
 
        DivergedBranches: These branches have diverged.
 
245
        DivergedBranches: These branches have diverged.  Try merge.
246
246
        """
247
247
        self_history = self.revision_history()
248
248
        self_len = len(self_history)