/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/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2009-02-27 16:00:14 UTC
  • mto: This revision was merged to the branch mainline in revision 4076.
  • Revision ID: jelmer@samba.org-20090227160014-8k9jb60wz40m9l93
New Branch.import_last_Revision_info() function used to pull revisions into the master branch during commit.

Show diffs side-by-side

added added

removed removed

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