Bazaar

Merge lp://staging/~spiv/bzr/stacked-2a-reconcile into lp://staging/bzr

  1. stacked-2a-reconcile
  2. Merge into bzr.dev
Proposed by Andrew Bennetts
Status: Work in progress
Proposed branch: lp://staging/~spiv/bzr/stacked-2a-reconcile
Merge into: lp://staging/bzr
Diff against target: 21 lines (+2/-3)
1 file modified
bzrlib/repofmt/groupcompress_repo.py (+2/-3)
To merge this branch: bzr merge lp://staging/~spiv/bzr/stacked-2a-reconcile
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+32074@code.staging.launchpad.net

Description of the change

See description of bug 615236; GCCHKPacker got fixed at some point to take parent inventories for stacking into account, but the GCCHKReconcilePacker didn't get a corresponding change. This patch makes them share the relevant code.

Probably this should have a test before merging, but I'd like to get feedback on whether my understanding of the code is correct, if anyone knows :)

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Looks sane offhand.

Reply
Revision history for this message
Vincent Ladeuil (vila) wrote :

Considering Robert's comment as addressing your feedback query, I'll mark this as WIP waiting for your test :)

Reply

Unmerged revisions

5375. By Andrew Bennetts

Reuse GCCHKPacker's _copy_inventory_texts in GCCHKReconcilePacker, including missing_inventories logic.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.