← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Finish deprecating Branch.working_tree()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
255
255
        If self and other have not diverged, return a list of the revisions
256
256
        present in other, but missing from self.
257
257
 
 
258
        >>> from bzrlib.workingtree import WorkingTree
258
259
        >>> bzrlib.trace.silent = True
259
260
        >>> br1 = ScratchBranch()
 
261
        >>> wt1 = WorkingTree(br1.base, br1)
 
262
        ...
260
263
        >>> br2 = ScratchBranch()
 
264
        >>> wt2 = WorkingTree(br2.base, br2)
 
265
        ...
261
266
        >>> br1.missing_revisions(br2)
262
267
        []
263
 
        >>> br2.working_tree().commit("lala!", rev_id="REVISION-ID-1")
 
268
        >>> wt2.commit("lala!", rev_id="REVISION-ID-1")
264
269
        >>> br1.missing_revisions(br2)
265
270
        [u'REVISION-ID-1']
266
271
        >>> br2.missing_revisions(br1)
267
272
        []
268
 
        >>> br1.working_tree().commit("lala!", rev_id="REVISION-ID-1")
 
273
        >>> wt1.commit("lala!", rev_id="REVISION-ID-1")
269
274
        >>> br1.missing_revisions(br2)
270
275
        []
271
 
        >>> br2.working_tree().commit("lala!", rev_id="REVISION-ID-2A")
 
276
        >>> wt2.commit("lala!", rev_id="REVISION-ID-2A")
272
277
        >>> br1.missing_revisions(br2)
273
278
        [u'REVISION-ID-2A']
274
 
        >>> br1.working_tree().commit("lala!", rev_id="REVISION-ID-2B")
 
279
        >>> wt1.commit("lala!", rev_id="REVISION-ID-2B")
275
280
        >>> br1.missing_revisions(br2)
276
281
        Traceback (most recent call last):
277
282
        DivergedBranches: These branches have diverged.  Try merge.