← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2009-02-25 15:59:10 UTC
  • mto: This revision was merged to the branch mainline in revision 4076.
  • Revision ID: jelmer@samba.org-20090225155910-a73p5tkqqve1cue1
https://launchpad.net/bugs/248289
Use Branch.pull() to update master branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
395
395
            # Upload revision data to the master.
396
396
            # this will propagate merged revisions too if needed.
397
397
            if self.bound_branch:
398
 
                if not self.master_branch.repository.has_same_location(
399
 
                        self.branch.repository):
400
 
                    self._set_progress_stage("Uploading data to master branch")
401
 
                    self.master_branch.repository.fetch(self.branch.repository,
402
 
                        revision_id=self.rev_id)
403
 
                # now the master has the revision data
404
 
                # 'commit' to the master first so a timeout here causes the
405
 
                # local branch to be out of date
406
 
                self.master_branch.set_last_revision_info(new_revno,
407
 
                                                          self.rev_id)
 
398
                self._set_progress_stage("Uploading data to master branch")
 
399
                self.master_branch.pull(self.branch, stop_revision=self.rev_id)
408
400
 
409
401
            # and now do the commit locally.
410
402
            self.branch.set_last_revision_info(new_revno, self.rev_id)