ptl-tool: checkout branch after creation#18157
Merged
joscollin merged 1 commit intoceph:masterfrom Oct 9, 2017
Merged
Conversation
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Member
Author
|
@joscollin should address batrick#3 |
joscollin
requested changes
Oct 7, 2017
| G.create_head(branch) | ||
| log.info("Created branch {branch}".format(branch=branch)) | ||
| G.head.reference = G.create_head(branch, force=True) | ||
| log.info("Checked out new branch {branch}".format(branch=branch)) |
Member
There was a problem hiding this comment.
I think this change needs to be combined. I mean, if a test branch already exist, then use it. Don't create a new one. If it doesn't exist then create a new one.
Because when I test it, I saw that if I execute the below commands, to merge 18107 and 10108 separately,
$ src/script/ptl-tool.py --base master --label wip-jcollin-testing 18107
$ src/script/ptl-tool.py --base master --label wip-jcollin-testing 18108
The changes provided by 18107 gets overwritten by the second execution of ptl-tool.py !
Member
Author
There was a problem hiding this comment.
That's intended. You should use --base-path heads/ --base wip-jcollin-testing --branch wip-jcollin-testing instead.
Member
There was a problem hiding this comment.
It gives me:
Detaching HEAD onto base: wip-jcollin-testing-20171007
Branch wip-jcollin-testing-20171007 does not exist!
Member
Author
There was a problem hiding this comment.
Sorry, use --base-path refs/heads/.
joscollin
approved these changes
Oct 9, 2017
Member
|
retest this please |
joscollin
reviewed
Oct 9, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR addresses batrick#3
Signed-off-by: Patrick Donnelly pdonnell@redhat.com