Merge lp://staging/~jelmer/brz/dirstate-3 into lp://staging/brz
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | Jelmer Vernooij |
| Approved revision: | 7826 |
| Merged at revision: | 7819 |
| Proposed branch: | lp://staging/~jelmer/brz/dirstate-3 |
| Merge into: | lp://staging/brz |
| Prerequisite: | lp://staging/~jelmer/brz/dirstate-2 |
| Diff against target: |
507 lines (+120/-116) 12 files modified
Cargo.lock (+2/-9) breezy/bzr/dirstate.py (+22/-69) breezy/bzr/tests/test__dirstate_helpers.py (+3/-15) breezy/bzr/tests/test_dirstate.py (+1/-1) crates/bazaar-py/Cargo.toml (+1/-0) crates/bazaar-py/src/dirstate.rs (+30/-3) crates/bazaar-py/src/inventory.rs (+1/-1) crates/bazaar-py/src/lib.rs (+4/-0) crates/dirstate/Cargo.toml (+1/-0) crates/dirstate/src/lib.rs (+54/-16) crates/transport-py/src/lib.rs (+1/-1) setup.py (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~jelmer/brz/dirstate-3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jelmer Vernooij | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2023-05-18.
Commit message
Move inv_entry_
Description of the change
Move inv_entry_
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) | # |
review:
Approve
Revision history for this message
| Jelmer Vernooij (jelmer) | # |
review:
Approve
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
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
Attempt to merge into lp:brz failed due to conflicts:
text conflict in breezy/