[
https://issues.apache.org/jira/browse/KAFKA-2328?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14629072#comment-14629072
]
Guozhang Wang commented on KAFKA-2328:
--------------------------------------
Even if I finished the merge process it seems still leave me in a detached
branch?
{code}
guozhang ~/Workspace/github/guozhangwang/kafka-review python kafka-merge-pr.py
git rev-parse HEAD
Which pull request would you like to merge? (e.g. 34): 78
=== Pull Request #78 ===
title KAFKA-2335; fix comment about thread safety
source hachikuji/KAFKA-2335
target trunk
url https://api.github.com/repos/apache/kafka/pulls/78
Proceed with merging pull request #78? (y/n): y
git fetch apache-github pull/78/head:PR_TOOL_MERGE_PR_78
remote: Counting objects: 12, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 12 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (12/12), done.
>From https://github.com/apache/kafka
* [new ref] refs/pull/78/head -> PR_TOOL_MERGE_PR_78
git fetch apache trunk:PR_TOOL_MERGE_PR_78_TRUNK
>From https://git-wip-us.apache.org/repos/asf/kafka
* [new branch] trunk -> PR_TOOL_MERGE_PR_78_TRUNK
* [new branch] trunk -> apache/trunk
git checkout PR_TOOL_MERGE_PR_78_TRUNK
Switched to branch 'PR_TOOL_MERGE_PR_78_TRUNK'
['git', 'merge', 'PR_TOOL_MERGE_PR_78', '--squash']
Automatic merge went well; stopped before committing as requested
['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_78', '--pretty=format:%an <%ae>']
['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_78', '--pretty=format:%h [%an] %s']
['git', 'commit', '--author="Jason Gustafson <ja...@confluent.io>"', '-m',
u'KAFKA-2335; fix comment about thread safety', '-m', u'', '-m', 'Author: Jason
Gustafson <ja...@confluent.io>', '-m', u'Closes #78 from hachikuji/KAFKA-2335
and squashes the following commits:', '-m', 'c697998 [Jason Gustafson]
KAFKA-2335; fix comment about consumer thread safety']
Merge complete (local ref PR_TOOL_MERGE_PR_78_TRUNK). Push to apache? (y/n): y
git push apache PR_TOOL_MERGE_PR_78_TRUNK:trunk
Counting objects: 12, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (12/12), 1007 bytes | 0 bytes/s, done.
Total 12 (delta 4), reused 0 (delta 0)
To https://git-wip-us.apache.org/repos/asf/kafka.git
99c0686..4fcb7ac PR_TOOL_MERGE_PR_78_TRUNK -> trunk
git rev-parse PR_TOOL_MERGE_PR_78_TRUNK
Restoring head pointer to 99c0686b
git checkout 99c0686b
Note: checking out '99c0686b'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at 99c0686... KAFKA-2123: add callback in commit api and use a
delayed queue for async requests; reviewed by Ewen Cheslack-Postava and
Guozhang Wang
git branch
Deleting local branch PR_TOOL_MERGE_PR_78
git branch -D PR_TOOL_MERGE_PR_78
Deleting local branch PR_TOOL_MERGE_PR_78_TRUNK
git branch -D PR_TOOL_MERGE_PR_78_TRUNK
Pull request #78 merged!
Merge hash: 4fcb7aca
Would you like to pick 4fcb7aca into another branch? (y/n): n
JIRA_USERNAME and JIRA_PASSWORD not set
Exiting without trying to close the associated JIRA.
guozhang ~/Workspace/github/guozhangwang/kafka-review git branch
* (detached from 99c0686)
trunk
{code}
> merge-kafka-pr.py script should restore previous branch after merge is
> cancelled
> --------------------------------------------------------------------------------
>
> Key: KAFKA-2328
> URL: https://issues.apache.org/jira/browse/KAFKA-2328
> Project: Kafka
> Issue Type: Improvement
> Reporter: Ismael Juma
> Priority: Minor
>
> [~gwenshap] asked:
> "If I start a merge and cancel (say, by choosing 'n' when asked if I want to
> proceed), I'm left on a detached branch. Any chance the script can put me
> back in the original branch? or in trunk?"
> Reference
> https://issues.apache.org/jira/browse/KAFKA-2187?focusedCommentId=14621243&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14621243
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
