Merge lp://qastaging/~jelmer/brz/git-drop-roundtrip into lp://qastaging/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://qastaging/~jelmer/brz/git-drop-roundtrip
Merge into: lp://qastaging/brz
Diff against target: 606 lines (+32/-230)
10 files modified
breezy/git/commit.py (+2/-28)
breezy/git/fetch.py (+1/-2)
breezy/git/mapping.py (+2/-86)
breezy/git/memorytree.py (+0/-5)
breezy/git/object_store.py (+0/-23)
breezy/git/roundtrip.py (+0/-27)
breezy/git/tests/test_roundtrip.py (+0/-13)
breezy/git/tests/test_workingtree.py (+3/-8)
breezy/git/tree.py (+19/-28)
breezy/git/workingtree.py (+5/-10)
To merge this branch: bzr merge lp://qastaging/~jelmer/brz/git-drop-roundtrip
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+369478@code.qastaging.launchpad.net

Commit message

Drop file id roundtripping support in Git.

Description of the change

Drop file id roundtripping support in Git.

File ids will soon be an implementation detail of the Bazaar format. Stashing
file ids somewhere in Git repositories is fraught with issues.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

I agree it makes sense to drop this.

review: Approve

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.

Subscribers

People subscribed via source and target branches