/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/git/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:
breezy/git/commit.py
142
142
            encoded_new_path = path[1].encode("utf-8")
143
143
            self._blobs[encoded_new_path] = (mode, sha)
144
144
            if st is not None:
145
 
                yield file_id, path[1], (entry.text_sha1, st)
 
145
                yield path[1], (entry.text_sha1, st)
146
146
            if self._mapping.generate_file_id(encoded_new_path) != file_id:
147
147
                self._override_fileids[encoded_new_path] = file_id
148
148
            else: