Scratch that - looks like you did it already.
Well that was exciting. :)
-hadriel
On Feb 27, 2014, at 3:35 PM, Hadriel Kaplan <hadriel.kaplan@xxxxxxxxxx> 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 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 want to mess this up further)
>
> -hadriel
>
>
> On Feb 27, 2014, at 3:05 PM, Gerald Combs <gerald@xxxxxxxxxxxxx> 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
>>
>> Gerrit was adding duplicate patch set entries to changes 375 and 420
>> every 5 minutes. I think I've stopped *that*, but each change now shows
>> "Unspecified merge failure: NO_PATCH_SET" where it should show the most
>> recent patch.
>>
>> Hadriel, can you abandon and resubmit changes 375 and 420? I'm not sure
>> I can fix the problem on the server end.
>>
>>
>> A fix for the problem has been merged in Gerrit:
>>
>> https://gerrit-review.googlesource.com/#/c/53080/2
>>
>> Hopefully it will be part of 2.8.2.
>>
>>
>> On 2/27/14 10:06 AM, Hadriel Kaplan wrote:
>>>
>>> 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, at 9:19 AM, Evan Huus <eapache@xxxxxxxxx> wrote:
>>>
>>>> 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.
>>>> ___________________________________________________________________________
>>>> Sent via: Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
>>>> Archives: http://www.wireshark.org/lists/wireshark-dev
>>>> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>>>> mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe
>>>
>>> ___________________________________________________________________________
>>> Sent via: Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
>>> Archives: http://www.wireshark.org/lists/wireshark-dev
>>> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>>> mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe
>>>
>>
>> ___________________________________________________________________________
>> Sent via: Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
>> Archives: http://www.wireshark.org/lists/wireshark-dev
>> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>> mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe
>
> ___________________________________________________________________________
> Sent via: Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> Archives: http://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
> mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe
