cli: merge op heads and snapshot working copy by "op log" by default #4165
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
reviewed
Jul 27, 2024
yuja
force-pushed
the
push-tssptnpsllnk
branch
2 times, most recently
from
dccdee0 to
dfd7cf4
Compare
martinvonz
approved these changes
Aug 1, 2024
The current "op abandon" and "op log" have workarounds to recover from this situation. Let's make sure they work as expected.
The idea is that --at-op specifies a certain operation, so --at-op=@ can be interpreted as the option to select _the_ known head operation. This helps eliminate special cases from "op log" which doesn't snapshot nor merge concurrent ops.
Now heads merging can be turned off by --at-op=@.
This partially reverts 543036c "cli: run 'op log' without loading repo or merging concurrent ops." User can now get around the issue by --at-op=@ --ignore-working-copy.
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.
Checklist
If applicable:
CHANGELOG.md