Fix #864 (fetching deleted/moved branches in colocated repos) #1600
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ilyagr
force-pushed
the
fetchdel
branch
10 times, most recently
from
5ce7dca to
0caa03b
Compare
ilyagr
force-pushed
the
fetchdel
branch
7 times, most recently
from
d444bcc to
522f553
Compare
|
I decided to change the "root cause" test to make it more clear why this crazy bug only affects colocated repos. I'm also reordering the commits a bit. (Update: this is all done) |
ilyagr
force-pushed
the
fetchdel
branch
5 times, most recently
from
05a80a7 to
df46428
Compare
|
I'll update this to address #864 (comment) as well. |
This is supposed to make `import_refs` and `export_refs` a little more readable.
ilyagr
changed the title
|
I believe it's all fixed. 🎉 |
ilyagr
force-pushed
the
fetchdel
branch
3 times, most recently
from
2842632 to
b297489
Compare
ilyagr
force-pushed
the
fetchdel
branch
2 times, most recently
from
ea27bd6 to
8e14835
Compare
jj-vcs#864) This bug concerns the way `import_refs` that gets called by `fetch` computes the heads that should be visible after the import. Previously, the list of such heads was computed *before* local branches were updated based on changes to the remote branches. So, commits that should have been abandoned based on this update of the local branches weren't properly abandoned. Now, `import_refs` tracks the heads that need to be visible because of some ref in a mapping keyed by the ref. If the ref moves or is deleted, the corresponding heads are updated. Fixes jj-vcs#864
…s (no-op) This is supposed to make `import_refs` and `export_refs` a little less prone to typos
This is supposed to make `export_refs` a little more readable.
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #864 ("In a git colocated repo, commits are not rebased off of a deleted/moved branch")
Update: Some technical details from the commit description:
Checklist
If applicable:
CHANGELOG.md