<html><body>
<p><font size="2" face="sans-serif">Last one, I swear (at least for a little while). And I'm sure that the change is in object-api this time.</font><br>
<br>
<font size="2" face="sans-serif">Attempting to fix my last commit message for this review: <a href="https://review.openstack.org/#/c/48573/">https://review.openstack.org/#/c/48573/</a></font><br>
<br>
<font size="2" face="sans-serif">Everything is fine until I hit git review -v</font><br>
<br>
<font size="2" face="sans-serif">Then I get a message that Automatic cherry pick failed.</font><br>
<br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git checkout master</font><br>
<font size="2" face="sans-serif">Switched to branch 'master'</font><br>
<font size="2" face="sans-serif">Your branch is ahead of 'origin/master' by 2 commits.</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git remote update</font><br>
<font size="2" face="sans-serif">Fetching origin</font><br>
<font size="2" face="sans-serif">Fetching gerrit</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git pull origin master</font><br>
<font size="2" face="sans-serif">From git://github.com/openstack/object-api</font><br>
<font size="2" face="sans-serif"> * branch master -> FETCH_HEAD</font><br>
<font size="2" face="sans-serif">Already up-to-date.</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git review -d 48573</font><br>
<font size="2" face="sans-serif">Downloading refs/changes/73/48573/1 from gerrit into review/kersten_richter/bug/1214139</font><br>
<font size="2" face="sans-serif">Branch already exists - reusing</font><br>
<font size="2" face="sans-serif">Switched to branch 'review/kersten_richter/bug/1214139'</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git commit -a --amend</font><br>
<font size="2" face="sans-serif">[review/kersten_richter/bug/1214139 6180e4a] Added Header files section to overview.</font><br>
<font size="2" face="sans-serif"> 1 files changed, 220 insertions(+), 109 deletions(-)</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git review -v</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.313755 Running: git log --color=never --oneline HEAD^1..HEAD</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.319399 Running: git remote</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.323764 Running: git branch -a --color=never</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.330512 Running: git branch --color=never</font><br>
<font size="2" face="sans-serif">Found topic 'bug/1214139' from parsing changes.</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.335430 Running: git rev-parse --git-dir</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.340200 Running: git remote update gerrit</font><br>
<font size="2" face="sans-serif">Fetching gerrit</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:02.549872 Running: git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Errors running git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Automatic cherry-pick failed. After resolving the conflicts,</font><br>
<font size="2" face="sans-serif">mark the corrected paths with 'git add <paths>', and</font><br>
<font size="2" face="sans-serif">run 'git rebase --continue'</font><br>
<font size="2" face="sans-serif">Could not apply 6180e4a... Added Header files section to overview.</font><br>
<br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git status</font><br>
<font size="2" face="sans-serif"># Not currently on any branch.</font><br>
<font size="2" face="sans-serif"># Unmerged paths:</font><br>
<font size="2" face="sans-serif"># (use "git reset HEAD <file>..." to unstage)</font><br>
<font size="2" face="sans-serif"># (use "git add/rm <file>..." as appropriate to mark resolution)</font><br>
<font size="2" face="sans-serif">#</font><br>
<font size="2" face="sans-serif"># both modified: openstack-object-storage-dev/ch_object-api-general.xml</font><br>
<font size="2" face="sans-serif">#</font><br>
<font size="2" face="sans-serif">no changes added to commit (use "git add" and/or "git commit -a")</font><br>
<br>
<font size="2" face="sans-serif">Running git commit -a gives me this:</font><br>
<br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git commit -a</font><br>
<font size="2" face="sans-serif">[detached HEAD 838f351] Added Header files section to overview.</font><br>
<font size="2" face="sans-serif"> 1 files changed, 223 insertions(+), 96 deletions(-)</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git review -v</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.422824 Running: git log --color=never --oneline HEAD^1..HEAD</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.428496 Running: git remote</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.432687 Running: git branch -a --color=never</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.439132 Running: git branch --color=never</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.444015 Running: git log HEAD^1..HEAD</font><br>
<font size="2" face="sans-serif">Found topic 'master' from parsing changes.</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.452316 Running: git rev-parse --git-dir</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.456883 Running: git remote update gerrit</font><br>
<font size="2" face="sans-serif">Fetching gerrit</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:09.619359 Running: git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Errors running git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Interactive rebase already started</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ </font><br>
<br>
<font size="2" face="sans-serif">I've tried so many different things at this point that I'm a little scared to look at my history. Anyone make heads or tails of this?</font><br>
<br>
<font size="2" face="sans-serif">Kersten J. Richter<br>
Software Engineer<br>
IBM, Rochester<br>
Home office: 952-652-5304<br>
<br>
If you lend someone $20 and never see that person again, it was probably worth it.</font></body></html>