Add support for kart resolve --renumber
#817
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
craigds
approved these changes
Apr 12, 2023
| a user could easily have an extra ":" on the end by accident. | ||
| """ | ||
| rstripped = conflict_label.rstrip(":") | ||
| if rstripped and len(rstripped) == len(conflict_label) - 1: |
There was a problem hiding this comment.
mind explaining this? is this in case there are multiple trailing colons?
There was a problem hiding this comment.
Basically - I want to handle "<dataset_name>:feature:` but not mess with junk like "::"
|
Thanks! I tested it with my conflicts (PK is an integer), and it worked smoothly on Ubuntu. I guess as suggested for string a check/error might be helpful. |
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.
Description
Adds support for any of the following ways of resolving conflicting primary keys occurring due to insert/insert conflicts.
kart resolve --renumber=ours# Renumber all our features that conflict, keep theirs unchangedkart resolve --renumber=theirs# Renumber all their features that conflict, keep ours unchangedkart resolve <dataset>:feature --renumber=(ours|theirs)# Renumber only features at a certain datasetkart resolve <dataset>:feature:<pk> --renumber=(ours|theirs)# Renumber only a certain feature at a certain datasetThe renumbered features will all be given contiguous primary keys from the unused range, beyond any existing primary key values.
Related links:
#814
Checklist: