[Development] ChangeLogs

Tor Arne Vestbø tor.arne.vestbo at digia.com
Tue Jan 22 14:18:46 CET 2013


On 1/21/13 17:14 , Thiago Macieira wrote:
> On segunda-feira, 21 de janeiro de 2013 17.02.10, Tor Arne Vestbø wrote:
>> On 1/21/13 16:37 , Giuseppe D'Angelo wrote:
>>> On 21 January 2013 15:08, Tor Arne Vestbø <tor.arne.vestbo at digia.com>
> wrote:
>>>> If you're writing the ChangeLog entry at commit time, not right before
>>>> the release, why can't your patch contain a change to dist/changelog
>>>> from the get-go which, can be reviewed and integrated along with the
>>>> code change?
>>>
>>> Because that usually causes silly conflicts when staging (=>merging)
>>> the patch. :(
>>
>> That can be solved by a git merge-driver for the changelog format.
>
> Note: the merging is done by Gerrit.

Hmm, and it doesn't support merge-drivers as far as I can tell :(

But isn't the merging done by the CI using regular Git by cherry-picking 
into the staging branch, and then integration is a fast-forward?

tor arne



More information about the Development mailing list