[Development] Bad merge resolution in qtbase's second commit

[Konstantin Tokarev]

18.09.2012, 16:05, "Thiago Macieira" <thiago.macieira at intel.com>:
> On terça-feira, 18 de setembro de 2012 15.09.41, Konstantin Tokarev wrote:
>
>>  18.09.2012, 14:51, "Thiago Macieira" <thiago.macieira at intel.com>:
>>>  To all developers and maintainers who have code in qtbase:
>>>
>>>  It appears that the merge resolution of the second commit in qtbase (which
>>>  is not represented in the repository, only the results are) introduced a
>>>  few regressions. So all developers working in qtbase, please take a
>>>  moment to look at the changes introduced to this commit and verify
>>>  whether the changes are intentional and should be there.
>>  Simpler solution is to disable "Automatically resolve conflicts" checkbox in
>>  Gerrit settings. It would prohibit merge of patches which require
>>  non-trivial merge.
>
> That's already the case. This merge was resolved by a human, before we even
> used Gerrit.
>
>>  Bad thing is that you would need to rebase your patches more often. Newer
>>  Gerrit versions (2.4 and higher) have server-side rebase feature - you
>>  press "Rebase" button in UI and get rebase as new patch set revision, which
>>  could be reviewed.
>
> Interesting. We're still using 2.2, so it might be a good idea to consider
> upgrading.

There are lots of other useful features unavailable in 2.2, like custom submit policies
(since 2.4), drafts (since 2.4), proper submodule support (since 2.3), plugins (since
2.5rc0), improved remote API.

-- 
Regards,
Konstantin