Merge lp://staging/~jelmer/brz/supports-rename-tracking into lp://staging/brz
Proposed by
Jelmer Vernooij
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~jelmer/brz/supports-rename-tracking |
| Merge into: | lp://staging/brz |
| Diff against target: |
1957 lines (+509/-527) 20 files modified
breezy/builtins.py (+7/-7) breezy/bzr/inventorytree.py (+0/-3) breezy/bzr/workingtree_4.py (+0/-3) breezy/log.py (+28/-31) breezy/memorytree.py (+0/-6) breezy/merge.py (+2/-1) breezy/rename_map.py (+9/-12) breezy/tests/blackbox/test_merge.py (+3/-3) breezy/tests/matchers.py (+67/-0) breezy/tests/per_tree/test_tree.py (+8/-0) breezy/tests/per_workingtree/test_add.py (+18/-35) breezy/tests/per_workingtree/test_move.py (+160/-238) breezy/tests/per_workingtree/test_rename_one.py (+85/-144) breezy/tests/per_workingtree/test_shelf_manager.py (+0/-1) breezy/tests/test_matchers.py (+25/-0) breezy/tests/test_rename_map.py (+12/-10) breezy/tests/test_tree.py (+31/-0) breezy/transform.py (+10/-16) breezy/tree.py (+44/-14) breezy/workingtree.py (+0/-3) |
| To merge this branch: | bzr merge lp://staging/~jelmer/brz/supports-rename-tracking |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Breezy developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2018-03-17.
Commit message
Add a flag for Trees to indicate whether they support rename tracking.
Description of the change
Add a flag for Trees to indicate whether they support rename tracking.
For now, this just causes tests to stop expecting rename tracking. In the future, this can be used to determine whether rename guessing should be used (e.g. for git).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
