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

[liang.qi at nokia.com]

I checked history/qtquick2 branch in qt repo from gitorious, looks like both  daba2c507ad42c66dafa6a29cffa94e9641e0c58 and d9c06bf25210b3d0b31ee6126e57bcb82c292da1 are there.

I "git blame src/corelib/io/qprocess_unix.cpp" and "git log" it, got

9f9f3314144b54121a29c37270c73075bae2e129 is the issue commit.

Regards,
Liang

________________________________________
From: development-bounces+liang.qi=nokia.com at qt-project.org [development-bounces+liang.qi=nokia.com at qt-project.org] on behalf of ext Thiago Macieira [thiago.macieira at intel.com]
Sent: Tuesday, September 18, 2012 12:51
To: development at qt-project.org
Subject: [Development] Bad merge resolution in qtbase's second commit

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.

Long explanation:

The first commit in qtbase is 38be0d13830efd2d98281c645c3a60afe05ffece ("Initial
import from the monolithic Qt."), which imported the sources from the
monolithic repo.

The second commit in qtbase is eae8fb85997d82ecec0743ba3e470681129bff41
("Initial import from qtquick2."). I don't remember exactly the details, but
IIRC it was a separate branch/repository that was developing qtquick2 at the
time of the modularisation.

During the Qt 4.8 development cycle, harryF introduced commit
daba2c507ad42c66dafa6a29cffa94e9641e0c58 ("Delay creation of the process
manager"), which caused a regression and was reverted a month and a half later
in d9c06bf25210b3d0b31ee6126e57bcb82c292da1. Apparently, this reversal was
never merged into the qtquick2 development branch, which caused the merging
that produced qtbase's second commit to bring the regression back.

Since this happened to QProcess & QCoreApplication, it could have happened to
other code. Please verify this merge.

--
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