Merge lp:~gz/brz/unmapped into lp:brz
Proposed by
Martin Packman
Status: | Superseded |
---|---|
Proposed branch: | lp:~gz/brz/unmapped |
Merge into: | lp:brz |
Diff against target: |
93 lines (+12/-4) (has conflicts) 5 files modified
breezy/btree_index.py (+1/-0) breezy/groupcompress.py (+3/-0) breezy/log.py (+1/-2) breezy/repofmt/knitpack_repo.py (+3/-2) breezy/versionedfile.py (+4/-0) Text conflict in breezy/versionedfile.py |
To merge this branch: | bzr merge lp:~gz/brz/unmapped |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman | Approve | ||
Review via email: mp+324579@code.launchpad.net |
This proposal has been superseded by a proposal from 2017-05-25.
Commit message
Followup change from using future_builtins to importing via sixish
Description of the change
Bot cunningly didn't land unapproved changes from unmapped branch. But I wanted these changes. :)
To post a comment you must log in.
Self approving as simple tweaks.