Re: [ptp-dev] GUI Term commit issue

[Roland Schulz <roland@xxxxxxx>]

On Thu, Nov 7, 2013 at 2:51 PM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:

I tried a number of things. The latest was this:

Start a new repo:
git clone ssh://sbrandtn08@xxxxxxxxxxxxxxx:29418/ptp/org.eclipse.ptp

Get it to the right version
git fetch git://git.eclipse.org/gitroot/ptp/org.eclipse.ptp
refs/changes/27/17427/2 && git cherry-pick FETCH_HEA

You don't want to use cherry-pick but checkout. If you cherry-pick you rebase the commit onto the latest version (the one you got by clone). This makes it difficult to review. Because now the changes between the 1st version of your patch and the 2nd contains both your changes and the difference introduced by the latest version. But it doesn't explain why it didn't work.

 

I then put the changes in I wanted in, and committed with amend. This
gets rejected because "fast fowards" are not allowed.

I assume you mean non-fast forward. Fast forwards are always allowed. You would have gotten that error message if you tried to push directly to the branch without code review. Make sure you push to refs/for/master NOT refs/heads/master. In Eclipse you need to select Team->Remote->Push To Gerrit. Not "Push" or the "Push" in the commit dialog. 

Roland

 

Googling says to solve this, I have to do a git pull. If I do a git
pull, then there are multiple commits in my history and they aren't all
signed off by me, so Gerrit rejects.

I'm thinking that the only way out of this problem is to kill
https://git.eclipse.org/r/#/c/17427/ and start over. Any other thoughts?

Cheers,
Steve
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev

--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309