Merge lp://staging/~jelmer/brz/brz-git-renames into lp://staging/brz
Proposed by
Jelmer Vernooij
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Jelmer Vernooij | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merge reported by: | The Breezy Bot | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~jelmer/brz/brz-git-renames | ||||
| Merge into: | lp://staging/brz | ||||
| Diff against target: |
503 lines (+218/-170) 8 files modified
breezy/builtins.py (+4/-4) breezy/bzr/inventorytree.py (+1/-84) breezy/bzr/workingtree.py (+23/-0) breezy/tests/per_tree/test_inv.py (+0/-82) breezy/tests/per_workingtree/__init__.py (+1/-0) breezy/tests/per_workingtree/test_canonical_path.py (+109/-0) breezy/tree.py (+44/-0) breezy/workingtree.py (+36/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~jelmer/brz/brz-git-renames | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman | Approve | ||
|
Review via email:
|
|||
Description of the change
Some refactoring around get_canonical_
* Drop the 'inventory' bit since it doesn't apply to non-inventory trees
* Move to working trees; canonicalization currently only matters there, where
files can be stored on case-insensitive (VFAT) or normalizing filesystems
(i.e. Mac OS X)
* Run tests against all working tree formats, including Git, not just InventoryTree ones
This fixes 'bzr mv' and 'bzr rename' for Git.
To post a comment you must log in.
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Okay, moves seem reasonable to me. The logic is not all correct, but we'll need to do another pass anyway to deal with filesystem mapping issues.