← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Aaron Bentley
  • Date: 2012-07-18 18:30:48 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120718183048-rr45kn62nh6m24vv
Restore uncommitted changes even if revisions are same.

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, message=None):
 
3396
    def _get_uncommitted(self):
3397
3397
        self._ensure_real()
3398
 
        return self._real_branch.store_uncommitted(creator, message)
 
3398
        return self._real_branch._get_uncommitted()
3399
3399
 
3400
 
    def get_unshelver(self, tree):
 
3400
    def _put_uncommitted(self, transform):
3401
3401
        self._ensure_real()
3402
 
        return self._real_branch.get_unshelver(tree)
 
3402
        return self._real_branch._put_uncommitted(transform)
3403
3403
 
3404
3404
    def _get_real_transport(self):
3405
3405
        # if we try vfs access, return the real branch's vfs transport