/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/object_store.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-12-22 11:51:47 UTC
  • mfrom: (7414.1.1 git-push)
  • Revision ID: breezy.the.bot@gmail.com-20191222115147-ruy6rzy3v6nvj67n
Fix handling of no-change merges during push.

Merged from https://code.launchpad.net/~jelmer/brz/git-push/+merge/375931

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
265
265
                    blob_id = idmap.lookup_blob_id(
266
266
                        pfile_id, prevision)
267
267
                except KeyError:
268
 
                    if not changed_content:
 
268
                    if not change.changed_content:
269
269
                        # no-change merge ?
270
270
                        blob = Blob()
271
271
                        blob.data = tree.get_file_text(change.path[1])