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/ (+4/-4)
breezy/bzr/ (+1/-84)
breezy/bzr/ (+23/-0)
breezy/tests/per_tree/ (+0/-82)
breezy/tests/per_workingtree/ (+1/-0)
breezy/tests/per_workingtree/ (+109/-0)
breezy/ (+44/-0)
breezy/ (+36/-0)
To merge this branch: bzr merge lp://staging/~jelmer/brz/brz-git-renames
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email:

Description of the change

Some refactoring around get_canonical_inventory_paths.

* 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
Martin Packman (gz) wrote :

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.

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches