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

[Thiago Macieira]

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.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
     Intel Sweden AB - Registration Number: 556189-6027
     Knarrarnäsgatan 15, 164 40 Kista, Stockholm, Sweden
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.qt-project.org/pipermail/development/attachments/20120918/8951448e/attachment.sig>