[Development] [IMPORTANT] your commits in stable branch perhaps lost after dev branch merged

[Thiago Macieira]

On quinta-feira, 21 de março de 2013 14.33.30, Qi Liang wrote:
> Hi, all,
> 
> I think it's important, your commits in stable branch perhaps lost after dev
> branch merged. At least we found one case:
> https://codereview.qt-project.org/51722

Let's be more clear: no commits were lost. They are all still present.

However, due to conflicts, some changes may have been improperly resolved. This 
is no different than any other merge, in any direction.

> Before the big merge happened recently, we normally will fix some bugs in
> stable branch(5.0), and they will be merged into dev branch regularly,
> normally manually done by Frederik Gladhorn(thanks for his work).
> 
> But this time, we didn't do the regular stable->dev merge just before the
> current unfinished BIG dev->stable merge. When dev->stable merge happened,
> the "merger" maybe had chosen the dev code to override the stable one when
> conflicts happened. Then some commits in stable maybe lost. If you have
> some recent commits in stable, pls check whether it is still in stable
> after the dev->stable merge.

When there's a conflict the merger does not know how to resolve, the merger 
asks for help. Choosing unconditionally one side is a bad idea.

> For example, for qtbase, last stable->dev happened March 6,
> 49a2ec05b43b49d06dba8c6909c9df8d308e127d. And dev->stable is March 20,
> e5a11fbb3251a98fafd6bebf0b6fc366acb19088. BTW, we also have some merges
> from or to release, better to also check them.
> 
> This is the first time which we merge dev->stable in qt history, I think.

It's not the first dev-stable merge. The direction does not matter. This merge 
is no different than the previous ones.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
-------------- 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/20130321/e81bdde4/attachment.sig>