[OpenAFS-devel] Gerrit/git mistake

[Derrick Brashear]

Don't send us your merge commits; Rebase then away, or:

On Tue, Oct 19, 2010 at 8:35 AM, Phillip Moore
<w.phillip.moore@gmail.com> wrote:
> This doesn't look right...
> pmoore@Renegade$ git push ssh://gerrit.openafs.org/openafs.git
> HEAD:refs/for/master
> Counting objects: 16, done.
> Delta compression using up to 2 threads.
> Compressing objects: 100% (7/7), done.
> Writing objects: 100% (7/7), 1.17 KiB, done.
> Total 7 (delta 4), reused 0 (delta 0)
> New Changes:
> =A0=A0http://gerrit.openafs.org/3003
> =A0=A0http://gerrit.openafs.org/3004
> =A0=A0http://gerrit.openafs.org/3005
> To ssh://gerrit.openafs.org/openafs.git
> =A0* [new branch] =A0 =A0 =A0HEAD -> refs/for/master
> That should have been one simple change, but before creating the topic
> branch, I think (I'm not sure -- I did this a few days ago) I just did "g=
it
> pull" to update my copy of master.

git fetch; git checkout origin/master; git cherry-pick (your change) is one=
 way.

> Was that the wrong way to stay in sync? =A0Am I supposed to be using reba=
se
> instead?

that also works.

> Looking at gerrit, two of those "changes" are empty, and the most recent =
one
> has the fs getfid patch I thought I was submitting.
> Can someone let me know what I did wrong, so I can avoid the same mistake=
 in
> the future?



--=20
Derrick