tools: patchoulene: Handle reverts semi-automatically - #21
Merged
Conversation
This can happen if a commit was reverted and a new version was posted later. In this case, the database would the new patch as the replacement, and later record invocations would ignore this commit Signed-off-by: Vivian Wang <wangruikang@iscas.ac.cn>
If a patch in rev1 was removed because it was already replaced by some other patch in rev1, mark the replacement as "~" instead of "+" to indicate this special case. Signed-off-by: Vivian Wang <wangruikang@iscas.ac.cn>
If a patch has both merged and replacement, then this is probably a reverted patch, so disregard merged versions for the purposes of comparison. Signed-off-by: Vivian Wang <wangruikang@iscas.ac.cn>
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
2 participants
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.
The combination of these changes should allow for an okay experience when adding a
"replacement"key tocommit:patches, which is useful to handle upstream reverts.