~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Teach WorkingTree.commit to return the committed revision id.

Show diffs side-by-side

added added

removed removed

Lines of Context:
332
332
        >>> br1.missing_revisions(br2)
333
333
        []
334
334
        >>> wt2.commit("lala!", rev_id="REVISION-ID-1")
 
335
        'REVISION-ID-1'
335
336
        >>> br1.missing_revisions(br2)
336
337
        [u'REVISION-ID-1']
337
338
        >>> br2.missing_revisions(br1)
338
339
        []
339
340
        >>> wt1.commit("lala!", rev_id="REVISION-ID-1")
 
341
        'REVISION-ID-1'
340
342
        >>> br1.missing_revisions(br2)
341
343
        []
342
344
        >>> wt2.commit("lala!", rev_id="REVISION-ID-2A")
 
345
        'REVISION-ID-2A'
343
346
        >>> br1.missing_revisions(br2)
344
347
        [u'REVISION-ID-2A']
345
348
        >>> wt1.commit("lala!", rev_id="REVISION-ID-2B")
 
349
        'REVISION-ID-2B'
346
350
        >>> br1.missing_revisions(br2)
347
351
        Traceback (most recent call last):
348
352
        DivergedBranches: These branches have diverged.  Try merge.