[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [egit-dev] Cherry-pick & Gerrit Change-ID

2011/12/22 Markus Duft <markus.duft@xxxxxxxxxx>
On 12/22/2011 09:31 AM, SaÅa Åivkov wrote:
> On Thu, Dec 22, 2011 at 9:06 AM, Markus Duft <markus.duft@xxxxxxxxxx> wrote:
>>
>>
>> On 12/21/2011 01:50 PM, Matthias Sohn wrote:
>>> 2011/12/21 Markus Duft <markus.duft@xxxxxxxxxx <mailto:markus.duft@xxxxxxxxxx>>
>> [snip]
>>>
>>>
>>> yes, this is for sure better than the current behavior
>>
>> oh - oh.... in the case when i manually replace the change-id with the correct one, gerrit refuses the push... it tells me that the change id should be in the footer of the commit message, but it actually is before the lines denoting the conflicted files.... is this wrong?
>
> Gerrit expects change-id in the last paragraph of the commit message.
> Means, in the text after the last empty line.

Right, and egit puts it above the "conflicted files" section of the commit message. probably it just appends on the message _after_ the change id was added.

so as i see it there are small improvements to do here :)

yes, please file a bug for thisÂ

--
Matthias