[Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Evan Huus
I can't seem to submit either of the following two changes: https://code.wireshark.org/review/#/c/371/3 https://code.wireshark.org/review/#/c/420/1 They both say Submitted, Merge Pending but the submit button is still active and nothing has happened with either of them.

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Roland Knall
Judging from the experience I have with my own gerrit installation, it seems, that both patches lack the Verified +1 flag. Setting that and submitting will do the trick. regards, Roland On Thu, Feb 27, 2014 at 3:19 PM, Evan Huus eapa...@gmail.com wrote: I can't seem to submit either of the

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Hadriel Kaplan
Look at: https://code.wireshark.org/review/#/c/420/ It's saying it does NOT have the verified flag, even though there's a comment saying you set it. And it has a whole bunch of patches showing, even though I did not submit all of those. Weird. It may be fubar. -hadriel On Feb 27, 2014,

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Evan Huus
I marked the verified flag and it still didn't work. I also tried submitting dependencies, but now Gerrit appears to be all confused - review 420 won't even load anymore... On Thu, Feb 27, 2014 at 9:25 AM, Roland Knall rkn...@gmail.com wrote: Judging from the experience I have with my own gerrit

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Gerald Combs
We appear to have had a mid-air collision. The server log has the Concurrent modification detected and duplicate key errors described in Gerrit bug 2034: http://code.google.com/p/gerrit/issues/detail?id=2034 Gerrit was adding duplicate patch set entries to changes 375 and 420 every 5 minutes. I

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Hadriel Kaplan
I'm not sure if you got the email notifications, because two of them are wedged, but review/371 succeeded while the other two produced this: Evan Huus has submitted this change and it FAILED to merge. Change subject: Fix coverity warnings for all wslua files.

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Hadriel Kaplan
And we just had an email mid-air collision. :) I can't abandon them, because I can't access them at all through the web page. Is there some way to abandon them through command line? -hadriel On Feb 27, 2014, at 3:05 PM, Gerald Combs ger...@wireshark.org wrote: We appear to have had a

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Roland Knall
ssh -p 29418 Code.wireshark.org gerrit And he will Print the help Regards Am Donnerstag, 27. Februar 2014 schrieb Hadriel Kaplan : And we just had an email mid-air collision. :) I can't abandon them, because I can't access them at all through the web page. Is there some way to abandon

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Hadriel Kaplan
Actually shouldn't it be Evan who abandons them? I assumed the cherry-pick mode of gerrit meant he was cherry-picking my branch patch commit, creating a new commit, and merging the new one into master. So it's his commit that needs to be abandoned no? (I'm willing to try it, but I just don't

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Gerald Combs
I was able to abandon them through the web interface. On 2/27/14 12:12 PM, Hadriel Kaplan wrote: And we just had an email mid-air collision. :) I can't abandon them, because I can't access them at all through the web page. Is there some way to abandon them through command line? -hadriel

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Hadriel Kaplan
Scratch that - looks like you did it already. Well that was exciting. :) -hadriel On Feb 27, 2014, at 3:35 PM, Hadriel Kaplan hadriel.kap...@oracle.com wrote: Actually shouldn't it be Evan who abandons them? I assumed the cherry-pick mode of gerrit meant he was cherry-picking my branch

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Evan Huus
On Thu, Feb 27, 2014 at 3:05 PM, Gerald Combs ger...@wireshark.org wrote: We appear to have had a mid-air collision. The server log has the Concurrent modification detected and duplicate key errors described in Gerrit bug 2034: http://code.google.com/p/gerrit/issues/detail?id=2034 Yikes.

Re: [Wireshark-dev] Gerrit Stuck?

2014-02-27 Thread Roland Knall
ssh -p 29418 Code.wireshark.org gerrit And he will Print the help Regards Am Donnerstag, 27. Februar 2014 schrieb Hadriel Kaplan : And we just had an email mid-air collision. :) I can't abandon them, because I can't access them at all through the web page. Is there some way to abandon