Re: Git Migration: Status Update

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 03/04/2012 02:09 PM, Stefan Marr wrote: > Hi David: > > On 03 Mar 2012, at 22:58, David Soria Parra wrote: > >> (1) Pull requests on github.com go to the git-pull mailinglist. >> Make sure you subscribe to it. (2) Johannes is working on an >> interface that allows people with valid PHP user accounts to >> close pull requests. (2) Fix the bugsweb integration, so that >> references to bugs inside the commits will work. Florian is >> working on it. (4) FAQ > > Will there be an integration with pull requests and the bug > tracker, or remains attaching patches the preferred way? Nobody has worked on that, but it's a possiblity. I would like to see pull requests supported in the bugtracker. > > What is the new preferred replacement for a sparse SVN checkout + > single commit per change? As I understand it, currently, we try to > have a single commit for all branches (PHP_5_n, and trunk). How is > that supposed to be done with git? From reading > https://wiki.php.net/rfc/dvcs#workflows, I assume, all branches > need to receive separate commits + pushes? Sparse checkouts won't work anymore. The proposed workflow is: commit to the lower possible branch, then merge up to the other branches e.g: $ git checkout PHP_5_3 ..hackhack... $ git commit $ git checkout PHP_5_4 $ git merge PHP_5_3 $ git checkout master $ git merge PHP_5_4 There will be situations were we have to cherry pick certain changesets and then make sure that git doesn't get confused. David -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJPU9tNAAoJEAT0aMuPE7Z1sFcP/3Bc4AFhR0D78PDpovnflR8D KWRNyl6s1w6cwo1P98NhZzIJ9DuxKg0VAkU18YZamDpoghJScJe/W9YFu4xJLuZF oaw/4HhVxiQyi60i+eAADx9rAeanVRPVlBEjB4SOsAuj2Ax9Mx8gcfUHu37X+CiT sXOfL92lDDsHx9kJMM/mHkkXpyf5xfcgUatHoTNiBY7qkmznIvVEto8ohGmjsCbh GUQK5xbIqFzcmuN9uLnfMiDsppL+fFO05VHWJam8KmpoUQ4vNINZZp7zhpjGj5on PGi3Q/5jlAtJvK0utvqpfFbolk+d+54BN6YlnfNEsP/kageNIuR42qq/5SVm6qPa qyDcmrQp5kgyOAy2SwxFYZThEel46FBgu8LmCizh6n/sCgk9hFkg1GSH7lxNA4D5 FASiv1zYDVY2RpnxTyArUmgSdns+k6gXwc2gYZ6CcDJSzTg2jSPnyyjWjbKy5Edd k8NOHxM+GduvHpbQGO1uk2sk3TLY8inWHW22IVtIZ+kiXKPW2daJs8AcKeQqUSUe /mZQ3tci8XlWiaazWbcoU5Zw5iHNp/39BRWkJi2rHCNGFEqrcUOF8o4fo9Txjlwi 7h2vhcl00el1vS5k6vNQhrPd4a98uOc2AQQOJuwlAM2+xXgoxxuGPC0kAfP4n2+s zRsjMjOBD3ZCNypV8U0R =RgaM -----END PGP SIGNATURE-----