/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Aaron Bentley
  • Date: 2007-12-04 03:36:03 UTC
  • mfrom: (3073 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071204033603-equ8y41vfk8vkway
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1283
1283
        self._ensure_real()
1284
1284
        return self._real_branch.set_push_location(location)
1285
1285
 
1286
 
    def update_revisions(self, other, stop_revision=None):
 
1286
    def update_revisions(self, other, stop_revision=None, overwrite=False):
1287
1287
        self._ensure_real()
1288
1288
        return self._real_branch.update_revisions(
1289
 
            other, stop_revision=stop_revision)
 
1289
            other, stop_revision=stop_revision, overwrite=overwrite)
1290
1290
 
1291
1291
 
1292
1292
class RemoteBranchConfig(BranchConfig):