Merge lp:~gz/brz/unmapped_extra into lp:brz
Proposed by
Martin Packman
on 2017-05-25
Status: | Merged |
---|---|
Approved by: | Martin Packman on 2017-05-25 |
Approved revision: | 6635 |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~gz/brz/unmapped_extra |
Merge into: | lp:brz |
Diff against target: |
118 lines (+9/-10) 6 files modified
breezy/btree_index.py (+1/-2) breezy/groupcompress.py (+3/-1) breezy/log.py (+1/-2) breezy/plugins/changelog_merge/changelog_merge.py (+0/-2) breezy/repofmt/knitpack_repo.py (+3/-2) breezy/versionedfile.py (+1/-1) |
To merge this branch: | bzr merge lp:~gz/brz/unmapped_extra |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman | Approve on 2017-05-25 | ||
Review via email:
|
This proposal supersedes 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. :)
Updated proposal avoiding criss-cross merge conflict.
To post a comment you must log in.
The Breezy Bot (the-breezy-bot) wrote : | # |
Running landing tests failed
http://
The Breezy Bot (the-breezy-bot) wrote : | # |
Running landing tests failed
http://
The Breezy Bot (the-breezy-bot) wrote : | # |
Running landing tests failed
http://
lp:~gz/brz/unmapped_extra
updated
on 2017-05-25
- 6635. By Martin Packman on 2017-05-25
-
Remove direct use of future_builtins module
Martin Packman (gz) wrote : | # |
Had misresolved a conflict in versionedfile, now fixed.
Self approving as simple tweaks.