← 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: 2011-04-18 23:21:01 UTC
  • mfrom: (5799 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5800.
  • Revision ID: jelmer@samba.org-20110418232101-utgj6599ow9ny9nh
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
455
455
            self._set_progress_stage("Uploading data to master branch")
456
456
            # 'commit' to the master first so a timeout here causes the
457
457
            # local branch to be out of date
458
 
            self.master_branch.import_last_revision_info_and_tags(
459
 
                self.branch, new_revno, self.rev_id)
 
458
            (new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
 
459
                self.branch, new_revno, self.rev_id, lossy=lossy)
 
460
            if lossy:
 
461
                self.branch.fetch(self.master_branch, self.rev_id)
460
462
 
461
463
        # and now do the commit locally.
462
464
        self.branch.set_last_revision_info(new_revno, self.rev_id)