lakefs import with merge support #726
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
johnnyaug
reviewed
Oct 1, 2020
cmd/lakefs/cmd/import.go
Outdated
| @@ -145,4 +166,5 @@ func init() { | |||
| importCmd.Flags().Bool(DryRunFlagName, false, "Only read inventory and print stats, without making any changes") | |||
| importCmd.Flags().StringP(ManifestURLFlagName, "m", "", fmt.Sprintf("S3 uri to the manifest.json to use for the import. Format: %s", ManifestURLFormat)) | |||
| _ = importCmd.MarkFlagRequired(ManifestURLFlagName) | |||
| importCmd.Flags().Bool(WithMergeFlagName, false, "With merge after import completes") | |||
There was a problem hiding this comment.
Helptext: "Merge imported data to the repository's main branch"
Flag suggestion: instead of with-merge >> "merge-to-main" -- but not sure about this one. WDYT?
There was a problem hiding this comment.
went with the default repository branch - not sure it will be main. also, GitHub remove main so I guess we will be next ;)
Co-authored-by: johnnyaug <yoni.augarten@treeverse.io>
…FS into feature/import-with-merge
johnnyaug
approved these changes
Oct 1, 2020
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 optional flag --with-merge will merge the import changes from our default branch to the repo default branch