----- Original Message -----
From: "Deepak C Shetty"
<deepakcs(a)linux.vnet.ibm.com>
To: "Alon Bar-Lev" <alonbl(a)redhat.com>
Cc: "VDSM Project Development" <vdsm-devel(a)lists.fedorahosted.org>
Sent: Sunday, September 23, 2012 7:17:18 PM
Subject: Re: [vdsm] Q on 'git push' to vdsm gerrit
On 09/22/2012 09:01 PM, Alon Bar-Lev wrote:
>
> ----- Original Message -----
>> From: "Deepak C Shetty" <deepakcs(a)linux.vnet.ibm.com>
>> To: "VDSM Project Development"
<vdsm-devel(a)lists.fedorahosted.org>
>> Sent: Saturday, September 22, 2012 3:47:24 PM
>> Subject: [vdsm] Q on 'git push' to vdsm gerrit
>>
>> Hi,
>>
>> I got the below error from git push, but my patchset is
>> actually
>> pushed, when i see it gerrit.
>> See change # 6856, patchset 8.
>>
>> git push gerrit.ovirt.org:vdsm HEAD:refs/for/master
>> Counting objects: 36, done.
>> Delta compression using up to 4 threads.
>> Compressing objects: 100% (22/22), done.
>> Writing objects: 100% (22/22), 4.33 KiB, done.
>> Total 22 (delta 18), reused 0 (delta 0)
>> remote: Resolving deltas: 100% (18/18)
>> remote: Processing changes: updated: 2, refs: 1, done
>> To gerrit.ovirt.org:vdsm
>> ! [remote rejected] HEAD -> refs/for/master (no changes made)
>> error: failed to push some refs to 'gerrit.ovirt.org:vdsm'
>>
>> Background:
>> 1) I was asked to split patchset 7 into multiple patches, rebase
>> and
>> post patchset 8
>> 2) So as part of patchset 8, i had to git pull, rebase and post it
>> via
>> git push ( keep the same ChangeID), which is when I see the above
>> error.
>> 3) But patchset 8 is visible in change 6856, so not sure if I need
>> to
>> be
>> concerned abt the above error ? What does it mean then ?
>> 3a) If you see patchset 8, the dependency is empty, is it
>> because
>> the prev patchset 7 was having a different dep. than 8 ?
>> 3b) But as part of 'parent' i see the reference to the dep.
>> patch.
>>
>> Question
>> 1) Is this the right way to do a git push ?
>> 2) Do i need to be concerned abt the git push error or I can
>> ignore
>> it ?
>> 3) Dependency for patchset 8 in gerrit is empty, tho' parent shows
>> reference to the dep. patch..is this ok, if not, what is the right
>> procedure to follow here ?
>>
>> thanx,
>> deepak
>>
> It should work without any error.
Hmm, I do see the error tho' as above.
>
> If you are to submit a patch series (several patches that depend on
> each other), you should have a branch based on master, and your 8
> commits, each with its own unique Change-Id.
> When pushing this branch you should see each commit depend on
> previous commit.
I am seeing each commit dep on the prev commit for all the patches
except the topmost, in gerrit. Not sure why.
I agree, i should have probably started a new topic, but i forgot,
hence
continued to post on master itself.
Try to branch and re-push, remove your own commits from master so you won't have
future problems.
Alon.