← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2006-02-11 11:58:06 UTC
  • mto: (1534.1.22 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060211115806-732dabc1e35714ed
Give format3 working trees their own last-revision marker.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
234
234
        >>> bzrlib.trace.silent = True
235
235
        >>> d1 = bzrdir.ScratchDir()
236
236
        >>> br1 = d1.open_branch()
237
 
        >>> wt1 = WorkingTree(br1.base, br1)
 
237
        >>> wt1 = d1.open_workingtree()
238
238
        >>> d2 = bzrdir.ScratchDir()
239
239
        >>> br2 = d2.open_branch()
240
 
        >>> wt2 = WorkingTree(br2.base, br2)
 
240
        >>> wt2 = d2.open_workingtree()
241
241
        >>> br1.missing_revisions(br2)
242
242
        []
243
243
        >>> wt2.commit("lala!", rev_id="REVISION-ID-1")
1006
1006
        if (self.base.find('://') != -1 or 
1007
1007
            not isinstance(self._transport, LocalTransport)):
1008
1008
            raise NoWorkingTree(self.base)
1009
 
        return WorkingTree(self.base, branch=self)
 
1009
        return self.bzrdir.open_workingtree()
1010
1010
 
1011
1011
    @needs_write_lock
1012
1012
    def pull(self, source, overwrite=False):