Commit:245e103ed397da272dbd0bf02ce221ae6bcbbdef
Author:Remi Collet r...@php.net Mon, 3 Jun 2013 14:17:00 +0200
Parents: 99ea60c2ddafcbd6daf4af766da51d28e167999b
Branches: PHP-5.5 master
Link:
Commit:99ea60c2ddafcbd6daf4af766da51d28e167999b
Author:Remi Collet r...@php.net Mon, 3 Jun 2013 14:15:18 +0200
Parents: ad135fc69ffe4298ea43d8b8996f3b055c2abf0c
Branches: PHP-5.5 master
Link:
Commit:809b13d67bacc14ca3aaaf675d04a4000235af22
Author:Remi Collet r...@php.net Mon, 3 Jun 2013 14:17:22 +0200
Parents: 760099c2e6e7d72d4fb14c85ef2c1d73dcf9fb4c
245e103ed397da272dbd0bf02ce221ae6bcbbdef
Branches: master
Link:
Commit:57dd91be827364eba4d185a20ff3b95d25031543
Author:Remi Collet r...@php.net Mon, 3 Jun 2013 15:02:43 +0200
Parents: 809b13d67bacc14ca3aaaf675d04a4000235af22
3579e81200927b75b2c5f353e016ec26d8884c26
Branches: master
Link:
Commit:3579e81200927b75b2c5f353e016ec26d8884c26
Author:Remi Collet r...@php.net Mon, 3 Jun 2013 15:01:48 +0200
Parents: 245e103ed397da272dbd0bf02ce221ae6bcbbdef
Branches: PHP-5.5 master
Link:
Correct, No BC breakage. I'm just new to git so I'm not familiar with how
to commit to different branches.
On Sun, Jun 2, 2013 at 10:53 PM, Stas Malyshev smalys...@sugarcrm.comwrote:
Hi!
Commit:0e2bcf3373d914a215784c041a2a4c3b6afc2034
Author:Stanley Sufficool ssuffic...@php.net
Commit:5a04ab9a54f529f4197bed6f17599604266cdb35
Author:Stanley Sufficool ssuffic...@php.net Mon, 3 Jun 2013
20:02:08 -0700
Parents: 7360f0f1e6c4b49e89bd3c2cf1f524e9cf7f9dcc
Branches: PHP-5.4
Link:
Commit:d8f938c78478c211dc3b5609e9f37d2e2c47896f
Author:Stanley Sufficool ssuffic...@php.net Mon, 3 Jun 2013
20:34:47 -0700
Parents: 3579e81200927b75b2c5f353e016ec26d8884c26
Branches: PHP-5.5
Link:
I probably futs that all up, but the fixes are now in 5.4 and 5.5 branches.
I guess the norm is to commit to the lowest branch and merge upwards :?
On Mon, Jun 3, 2013 at 7:28 PM, Stanley Sufficool ssuffic...@gmail.comwrote:
Correct, No BC breakage. I'm just new to git so I'm not familiar with
Hi!
I probably futs that all up, but the fixes are now in 5.4 and 5.5
branches. I guess the norm is to commit to the lowest branch and merge
upwards :?
Yes, this is usually how it is done. Thanks, I'll check if the branches
are in sync.
--
Stanislav Malyshev, Software Architect
SugarCRM:
Commit:74e52eaea9c9d030dd70cf915b6f506065741dca
Author:Stanislav Malyshev s...@php.net Mon, 3 Jun 2013 21:59:09
-0700
Parents: d8f938c78478c211dc3b5609e9f37d2e2c47896f
90bb28726bd0728059b0d58b1c063ae8ea250966
Branches: PHP-5.5
Link:
Commit:90bb28726bd0728059b0d58b1c063ae8ea250966
Author:Stanislav Malyshev s...@php.net Mon, 3 Jun 2013 21:54:50
-0700
Parents: 5a04ab9a54f529f4197bed6f17599604266cdb35
Branches: PHP-5.4 PHP-5.5
Link:
Hi!
I probably futs that all up, but the fixes are now in 5.4 and 5.5
branches. I guess the norm is to commit to the lowest branch and merge
upwards :?
I've merged up the changes, could you check out 5.4, 5.5 and master and
verify that the code changes are correct?
--
Stanislav Malyshev,
13 matches
Mail list logo