/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: 2011-04-12 00:44:43 UTC
  • mto: This revision was merged to the branch mainline in revision 5792.
  • Revision ID: jelmer@samba.org-20110412004443-pyp1gbdt5x4uo3hy
Add lossy argument to Branch.import_last_revision_info_and_tags.

Show diffs side-by-side

added added

removed removed

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