upload: Propagate PUSHED status down relative review graph#273
Open
Abhishek21g wants to merge 1 commit into
Open
upload: Propagate PUSHED status down relative review graph#273Abhishek21g wants to merge 1 commit into
Abhishek21g wants to merge 1 commit into
Conversation
When a topic must push after rebase detection, promote dependent ancestor and descendant reviews from REBASE to PUSHED so sibling branches in the same graph are not left stale. Fixes Skydio#163
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Fixes #163.
When rebase detection marks a topic as
PUSHED, also promote dependent topics in the relative graph fromREBASEtoPUSHEDby walking both ancestors (relative_topic) and descendants (review.children).Problem
After rebasing a stack and modifying a leaf topic, only one branch of the graph was promoted. Sibling children of a shared parent could remain
REBASE, producing stale forge diffs.Verification