/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: 2019-01-01 23:40:59 UTC
  • mfrom: (7206.6.8 move-reconcile)
  • Revision ID: breezy.the.bot@gmail.com-20190101234059-g2aoc3whzh3zkppv
Move bzr-specific reconcile bits to breezy.bzr.reconcile.

Merged from https://code.launchpad.net/~jelmer/brz/move-reconcile-1/+merge/359941

Show diffs side-by-side

added added

removed removed

Lines of Context:
681
681
        if self.exclude:
682
682
            iter_changes = filter_excluded(iter_changes, self.exclude)
683
683
        iter_changes = self._filter_iter_changes(iter_changes)
684
 
        for file_id, path, fs_hash in self.builder.record_iter_changes(
 
684
        for path, fs_hash in self.builder.record_iter_changes(
685
685
                self.work_tree, self.basis_revid, iter_changes):
686
686
            self.work_tree._observed_sha1(path, fs_hash)
687
687