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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-19 22:18:01 UTC
  • mfrom: (7515.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200619221801-6chb6w22ctckkajl
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386125

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
438
438
            # as updating its basis and unversioning paths that were missing.
439
439
            self.work_tree.unversion(self.deleted_paths)
440
440
            self._set_progress_stage("Updating the working tree")
441
 
            self.work_tree.update_basis_by_delta(self.rev_id,
442
 
                                                 self.builder.get_basis_delta())
 
441
            self.work_tree.update_basis_by_delta(
 
442
                self.rev_id, self.builder.get_basis_delta())
443
443
            self.reporter.completed(new_revno, self.rev_id)
444
444
            self._process_post_hooks(old_revno, new_revno)
445
445
            return self.rev_id