Open Stack

Thanks, that solved it. 

Obviously the git rebase --continue at the end is not that useful, since we did an abort at the beginning.

I admit to not understanding what's happening here. Time to study git some more.

Bernd.

-----Original Message-----
From: Andreas Jaeger [mailto:aj at suse.com] 
Sent: Wednesday, May 20, 2015 8:46 PM
To: Bernd Bausch; 'Gauvain Pocentek'; openstack-docs at lists.openstack.org
Subject: Re: [OpenStack-docs] Errors running git rebase -p -i remotes/gerrit/master

On 05/20/2015 12:43 PM, Bernd Bausch wrote:
> Thanks Gauvain!
>
> But no fun. I just removed everything, cloned openstack-manuals again, then git review -d 180503. Applied my changes, git add for one file, git commit -a --amend, then git review, drum roll, and...
>
> 	$ git review
> 	Errors running git rebase -p -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 pick 949b6fb1f63d87d02e6223cb974de4dfde52443b
>
> Conflicts? What conflicts?

You really need to rebase locally.

Do
git rebase --abort

Checkout and update master
git checkout master
git pull

Checkout your branch:
git review -d 180503
git rebase origin/master

Resolve any conflicts that arise:
edit the file
git add file

Check that all conflicts are resolved:
git status

Continue rebase:
git rebase --continue

And then you can do a git review

All the above steps should be documented as well, there's documentation on how to resolve conflicts if you have problems.

If nothing works, tell me and I'll rebase for you...

Andreas

>
> 	$ git status
> 	# Not currently on any branch.
> 	# Changes to be committed:
> 	#   (use "git reset HEAD <file>..." to unstage)
> 	#
> 	#	new file:   doc/common/figures/openstack-arch-kilo-logical.png
> 	#	modified:   doc/common/section_getstart_logical_arch.xml
> 	#
> 	# Unmerged paths:
> 	#   (use "git reset HEAD <file>..." to unstage)
> 	#   (use "git add/rm <file>..." as appropriate to mark resolution)
> 	#
> 	#	added by us:        doc/networking-guide/source/common
> 	#
> 	# Untracked files:
> 	#   (use "git add <file>..." to include in what will be committed)
> 	#
> 	#	doc/networking-guide/source/common~HEAD
> 	
> Aha, the networking guide is the culprit. Somehow, I guess. And I am suddenly not on any branch anymore.
> I will let you all save the world in Vancouver and then check again - perhaps the problem goes away. Of course, any other input in the meantime would be great.
>
> Bernd
>
> -----Original Message-----
> From: Gauvain Pocentek [mailto:gauvain.pocentek at objectif-libre.com]
> Sent: Wednesday, May 20, 2015 12:33 PM
> To: Bernd Bausch
> Cc: openstack-docs at lists.openstack.org
> Subject: Re: [OpenStack-docs] Errors running git rebase -p -i 
> remotes/gerrit/master
>
> Hi Bernd,
>
> I'm in Vancouver but I'll try to help anyway ;)
>
> Le 2015-05-20 04:29, Bernd Bausch a écrit :
>> Hi. Is there anybody not in Vancouver?
>>
>> My patch [1] is still not production-ready, but I would like to 
>> upload an intermediate result to Gerrit. Since others are working 
>> with openstack-manuals, I am getting this error:
>>
>> 	$ git review
>> 	Errors running git rebase -p -i remotes/gerrit/master
>> 	fatal: Commit 094a04b15ce073223ee34717e8c991a2e54ff60b is a merge 
>> but no -m option was given.
>> 	Could not pick 094a04b15ce073223ee34717e8c991a2e54ff60b
>>
>> I could try "git review -m", but I am afraid of possible undesirable 
>> consequences that I don't understand due to my mediocre knowledge of 
>> git.
>
> I usually use 'git review -d REVIEW_ID' to get gerrit reviews. 'git review' should handle the update of a local branch if needed.
>
> Let me know if this works for you.
>
> Gauvain
>
>>
>> Any advice?
>>
>> Bernd
>>
>> [1] https://review.openstack.org/#/c/180503/ if you are really 
>> interested.
>>
>>
>> _______________________________________________
>> OpenStack-docs mailing list
>> OpenStack-docs at lists.openstack.org
>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs
>
> Gauvain Pocentek
>
> Objectif Libre - Infrastructure et Formations Linux 
> http://www.objectif-libre.com
>
>
> _______________________________________________
> OpenStack-docs mailing list
> OpenStack-docs at lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs
>


--
  Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
   SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
    GF: Felix Imendörffer, Jane Smithard, Dilip Upmanyu, Graham Norton,
        HRB 21284 (AG Nürnberg)
     GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126