Open Stack

I ran it in the middle.  Here it is now:

[kersten at oc6256675768 object-api]$ git status
# Not currently on any branch.
nothing to commit (working directory clean)



Kersten J. Richter
Software Engineer
IBM, Rochester
Home office: 952-652-5304

If you lend someone $20 and never see that person again, it was probably
worth it.



From:	Diane Fleming <diane.fleming at rackspace.com>
To:	Kersten J Richter/Rochester/IBM at IBMUS,
            "openstack-docs at lists.openstack.org"
            <openstack-docs at lists.openstack.org>,
Date:	10/24/2013 02:02 PM
Subject:	Re: [Openstack-docs] resolving git review conflicts



can you run

git status

and send me the message?


Diane
----------------------------------------------
Diane Fleming
Software Developer II - US
diane.fleming at rackspace.com
Cell  512.323.6799
Office 512.874.1260
Skype drfleming0227
Google-plus diane.fleming at gmail.com

From: Kersten J Richter <kersten at us.ibm.com>
Date: Thursday, October 24, 2013 1:07 PM
To: "openstack-docs at lists.openstack.org" <
openstack-docs at lists.openstack.org>
Subject: [Openstack-docs] resolving git review conflicts



Last one, I swear (at least for a little while).  And I'm sure that the
change is in object-api this time.

Attempting to fix my last commit message for this review:
https://review.openstack.org/#/c/48573/

Everything is fine until I hit git review -v

Then I get a message that Automatic cherry pick failed.

[kersten at oc6256675768 object-api]$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 2 commits.
[kersten at oc6256675768 object-api]$ git remote update
Fetching origin
Fetching gerrit
[kersten at oc6256675768 object-api]$ git pull origin master
>From git://github.com/openstack/object-api
 * branch            master     -> FETCH_HEAD
Already up-to-date.
[kersten at oc6256675768 object-api]$ git review -d 48573
Downloading refs/changes/73/48573/1 from gerrit into
review/kersten_richter/bug/1214139
Branch already exists - reusing
Switched to branch 'review/kersten_richter/bug/1214139'
[kersten at oc6256675768 object-api]$ git commit -a --amend
[review/kersten_richter/bug/1214139 6180e4a] Added Header files section to
overview.
 1 files changed, 220 insertions(+), 109 deletions(-)
[kersten at oc6256675768 object-api]$ git review -v
2013-10-24 13:02:00.313755 Running: git log --color=never --oneline
HEAD^1..HEAD
2013-10-24 13:02:00.319399 Running: git remote
2013-10-24 13:02:00.323764 Running: git branch -a --color=never
2013-10-24 13:02:00.330512 Running: git branch --color=never
Found topic 'bug/1214139' from parsing changes.
2013-10-24 13:02:00.335430 Running: git rev-parse --git-dir
2013-10-24 13:02:00.340200 Running: git remote update gerrit
Fetching gerrit
2013-10-24 13:02:02.549872 Running: git rebase -i remotes/gerrit/master
Errors running git rebase -i remotes/gerrit/master
Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>', and
run 'git rebase --continue'
Could not apply 6180e4a... Added Header files section to overview.

[kersten at oc6256675768 object-api]$ git status
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified:
openstack-object-storage-dev/ch_object-api-general.xml
#
no changes added to commit (use "git add" and/or "git commit -a")

Running git commit -a gives me this:

[kersten at oc6256675768 object-api]$ git commit -a
[detached HEAD 838f351] Added Header files section to overview.
 1 files changed, 223 insertions(+), 96 deletions(-)
[kersten at oc6256675768 object-api]$ git review -v
2013-10-24 13:07:07.422824 Running: git log --color=never --oneline
HEAD^1..HEAD
2013-10-24 13:07:07.428496 Running: git remote
2013-10-24 13:07:07.432687 Running: git branch -a --color=never
2013-10-24 13:07:07.439132 Running: git branch --color=never
2013-10-24 13:07:07.444015 Running: git log HEAD^1..HEAD
Found topic 'master' from parsing changes.
2013-10-24 13:07:07.452316 Running: git rev-parse --git-dir
2013-10-24 13:07:07.456883 Running: git remote update gerrit
Fetching gerrit
2013-10-24 13:07:09.619359 Running: git rebase -i remotes/gerrit/master
Errors running git rebase -i remotes/gerrit/master
Interactive rebase already started
[kersten at oc6256675768 object-api]$

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?

Kersten J. Richter
Software Engineer
IBM, Rochester
Home office: 952-652-5304

If you lend someone $20 and never see that person again, it was probably
worth it.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-docs/attachments/20131024/d8c87a16/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: graycol.gif
Type: image/gif
Size: 105 bytes
Desc: not available
URL: <http://lists.openstack.org/pipermail/openstack-docs/attachments/20131024/d8c87a16/attachment-0001.gif>