Much improved git-cms-merge-topic #17
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
git cms-merge-topic: - Less embarassing option handling - Does not get confused by .gitignore, now present in CMSSW. - Support for non pull request branches. - Support for non cms-sw repositories. git cms-addpkg: - Brown paperbag bug which result in git cms-addpkg reverting changes pulled in. git cms-checkdeps: - Uses $CMSSW_VERSION as comparison base, regardless of the tag used by git cms-addpkg.
This is done to reuse code between git-cms-merge-topic and git-cms-addpkg. Notice it does not do any extra check, nor it invokes any git read-tree, but it leaves that task to the caller.
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.
No description provided.