← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Haw Loeung (hloeung)
  • Date: 2012-07-24 12:53:36 UTC
  • mfrom: (6541 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6542.
  • Revision ID: haw.loeung@canonical.com-20120724125336-r3wzxm02lyec7jm6
[hloeung] Merged with upstream resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
3393
3393
            self.conf_store =  RemoteBranchStore(self)
3394
3394
        return self.conf_store
3395
3395
 
 
3396
    def store_uncommitted(self, creator):
 
3397
        self._ensure_real()
 
3398
        return self._real_branch.store_uncommitted(creator)
 
3399
 
 
3400
    def get_unshelver(self, tree):
 
3401
        self._ensure_real()
 
3402
        return self._real_branch.get_unshelver(tree)
 
3403
 
3396
3404
    def _get_real_transport(self):
3397
3405
        # if we try vfs access, return the real branch's vfs transport
3398
3406
        self._ensure_real()