Make rev() detect all parents of the given commits #1329
Merged
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
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/rev-all-parents
branch
2 times, most recently
from
b0ab8c6
to
194387d
Compare
The `:rev()` filter used to only apply filters if the specified revisions where encountered during traversal. However, this meant that if an ancestor commit is reachable by multiple paths in the history and some include the specified revision and some don't, the ancestor has multiple corresponding filtered commits. This resulted in duplicated commits in those more complicated histories and caused "non roundtrip" issues. Now the rev filter will compute if a commit is reachable from the specifed commit in any way and apply if so. Change: rev-all-parents Co-authored-by: Ralf Jung <post@ralfj.de>
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/rev-all-parents
branch
from
194387d
to
1c7abe2
Compare
christian-schilling
deleted the
@changes/master/christian.schilling.de@gmail.com/rev-all-parents
branch
4 tasks
This was referenced May 11, 2024
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.
The
:rev()filter used to only apply filters if the specified revisions where encountered during traversal.However, this meant that if an ancestor commit is reachable by multiple paths in the history and some include the specified revision and some don't, the ancestor has multiple corresponding filtered commits.
This resulted in duplicated commits in those more complicated histories and caused "non roundtrip" issues.
Now the rev filter will compute if a commit is reachable from the specifed commit in any way and apply if so.
Change: rev-all-parents
Co-authored-by: Ralf Jung post@ralfj.de