Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:86334
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain belski.net from 85.214.73.107 cause and error)
To: "'Remi Collet'" <remi@fedoraproject.org>,
	<internals@lists.php.net>
References: <555D864F.10808@fedoraproject.org>
In-Reply-To: <555D864F.10808@fedoraproject.org>
Date: Thu, 21 May 2015 09:32:20 +0200
Message-ID: <002d01d09398$478a4360$d69eca20$@belski.net>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Thread-Index: AQKtQ/kZ7ZRaaTHGaVe5mViMMdP/yZvMpoGA
Content-Language: en-us
Subject: RE: [PHP-DEV] About merging Pull Request workflow
From: anatol.php@belski.net ("Anatol Belski")

Hi,

> -----Original Message-----
> From: Remi Collet [mailto:remi@fedoraproject.org]
> Sent: Thursday, May 21, 2015 9:17 AM
> To: internals@lists.php.net
> Subject: [PHP-DEV] About merging Pull Request workflow
>=20
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>=20
> Hi,
>=20
>=20
> Current workflow described in
> https://wiki.php.net/vcs/gitworkflow#merge_a_pull_request
>=20
> Problem, git history only give info about a "merge"
>=20
> Ex, after merging 1278:
>=20
> http://git.php.net/?p=3Dphp-
> src.git;a=3Dcommit;h=3Deef762d576e7744d6e0c8d6a3f997fe911b2dc34
>=20
> Another simple workflow could be
>=20
> 1/ Download the patch
> https://github.com/php/php-src/pull/1278.patch
>=20
> 2/ apply it
> git am 1278.patch
>=20
> 3/ close the PR from
> https://qa.php.net/pulls
>=20
> This preserve credits to the authors and give a better history.
>=20
> What do you think ?
>=20
>=20
> Remi
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
> Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
>=20
> iEYEARECAAYFAlVdhk8ACgkQYUppBSnxahhKuACfbXzDxPsZJTyfwLtyoTALPVhs
> dbUAn2kk9vlD//ZQvea5Me1KU2JMgjdQ
> =3D1Xi5
> -----END PGP SIGNATURE-----
>=20
> --
> PHP Internals - PHP Runtime Development Mailing List To unsubscribe, =
visit:
> http://www.php.net/unsub.php

Even more would make sense to do a rebase so the commits from the PR are =
put on the top of the branch. Not sure "git am" would trigger that. When =
one could avoid the merge commit, the history were of course cleaner.=20

I never looked inside that merge mechanics, but in general - such an =
automation, say when you only need to merge and the PR is marked =
automatically, is probably a good thing. Well, sometimes it fails but =
for that we've that special tool.=20

Regards

Anatol