Merge lp:~jelmer/brz/objects-2a into lp:brz
Proposed by
Jelmer Vernooij
on 2019-06-17
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij on 2019-06-22 |
Approved revision: | 7353 |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~jelmer/brz/objects-2a |
Merge into: | lp:brz |
Diff against target: |
131 lines (+24/-16) 6 files modified
breezy/bzr/workingtree.py (+9/-5) breezy/merge.py (+2/-3) breezy/tests/per_workingtree/test_workingtree.py (+1/-1) breezy/tests/test_revert.py (+5/-2) breezy/tests/test_transform.py (+1/-1) breezy/transform.py (+6/-4) |
To merge this branch: | bzr merge lp:~jelmer/brz/objects-2a |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman | 2019-06-17 | Approve on 2019-06-21 | |
Review via email:
|
Commit message
Use paths as keys in merge_modified dictionary.
Description of the change
Use paths as keys in merge_modified dictionary.
This brings us one step closer to not having file ids in public APIs.
To post a comment you must log in.
The Breezy Bot (the-breezy-bot) wrote : | # |
Project setup failed
https:/
The Breezy Bot (the-breezy-bot) wrote : | # |
Running landing tests failed
https:/
lp:~jelmer/brz/objects-2a
updated
on 2019-06-22
- 7352. By Jelmer Vernooij on 2019-06-21
-
Fix merge modified test on python3.
- 7353. By Jelmer Vernooij on 2019-06-22
-
Fix tests.
Looks good, thanks!