23 Nov
2010
23 Nov
'10
7:55 a.m.
Hi Marc,
I noticed you created several branches preparing for the 3.4.0 release.
Are there any guidelines for merging? For instance, when I fix a bug
in QA_3_3, should it be applied to MAINT_3_4, QA_3_4 and master?
Or will from now on, only security fixes be applied to QA_3_3?
--
Kind regards,
Dieter Adriaenssens
23 Nov
23 Nov
8:03 a.m.
Hi
Dne Tue, 23 Nov 2010 10:55:57 +0100
Dieter Adriaenssens <dieter.adriaenssens(a)gmail.com> napsal(a):
I noticed you created several branches preparing for
the 3.4.0 release.
Are there any guidelines for merging? For instance, when I fix a bug
in QA_3_3, should it be applied to MAINT_3_4, QA_3_4 and master?
Or will from now on, only security fixes be applied to QA_3_3?
As it will take some time to release 3.4, it makes sense to apply
patches to both of them.
The easiest way to do that is to commit to QA_3_3 first, then merge it
to QA_3_4 and then to master:
git checkout QA_3_3
edit foo.php
git add foo.php
git commit -m 'Fix something'
git checkout QA_3_4
git merge QA_3_3
git checkout master
git merge QA_3_4
--
Michal Čihař | http://cihar.com | http://blog.cihar.com
8:18 a.m.
Le 2010-11-23 05:03, Michal Čihař a écrit :
Hi
Dne Tue, 23 Nov 2010 10:55:57 +0100
Dieter Adriaenssens <dieter.adriaenssens(a)gmail.com> napsal(a):
I would apply the fix to MAINT_3_4_0 too because it's just at alpha; the
same until this branch advances to the rc level.
--
Marc Delisle
http://infomarc.info
I noticed you created several branches preparing
for the 3.4.0 release.
Are there any guidelines for merging? For instance, when I fix a bug
in QA_3_3, should it be applied to MAINT_3_4, QA_3_4 and master?
Or will from now on, only security fixes be applied to QA_3_3?
As it will take some time to release 3.4, it makes sense to apply
patches to both of them.
The easiest way to do that is to commit to QA_3_3 first, then merge it
to QA_3_4 and then to master:
git checkout QA_3_3
edit foo.php
git add foo.php
git commit -m 'Fix something'
git checkout QA_3_4
git merge QA_3_3
git checkout master
git merge QA_3_4
8:19 a.m.
Dne Tue, 23 Nov 2010 05:18:53 -0500
Marc Delisle <marc(a)infomarc.info> napsal(a):
Le 2010-11-23 05:03, Michal Čihař a écrit :
Indeed it should be there as well.
--
Michal Čihař | http://cihar.com | http://blog.cihar.com
Hi
Dne Tue, 23 Nov 2010 10:55:57 +0100
Dieter Adriaenssens <dieter.adriaenssens(a)gmail.com> napsal(a):
I would apply the fix to MAINT_3_4_0 too because it's just at alpha; the
same until this branch advances to the rc level. I noticed you created several branches preparing
for the 3.4.0 release.
Are there any guidelines for merging? For instance, when I fix a bug
in QA_3_3, should it be applied to MAINT_3_4, QA_3_4 and master?
Or will from now on, only security fixes be applied to QA_3_3?
As it will take some time to release 3.4, it makes sense to apply
patches to both of them.
The easiest way to do that is to commit to QA_3_3 first, then merge it
to QA_3_4 and then to master:
git checkout QA_3_3
edit foo.php
git add foo.php
git commit -m 'Fix something'
git checkout QA_3_4
git merge QA_3_3
git checkout master
git merge QA_3_4
10:38 a.m.
Hi,
2010/11/23 Michal Čihař <michal(a)cihar.com>om>:
Dne Tue, 23 Nov 2010 05:18:53 -0500
Marc Delisle <marc(a)infomarc.info> napsal(a):
So for now, the order for merging should be QA_3_3 -> MAINT_3_4_0 ->
QA_3_4 -> master, if I'm not mistaken?
Kind regards,
Dieter
Le 2010-11-23 05:03, Michal Čihař a écrit :
Indeed it should be there as well. Hi
Dne Tue, 23 Nov 2010 10:55:57 +0100
Dieter Adriaenssens <dieter.adriaenssens(a)gmail.com> napsal(a):
I would apply the fix to MAINT_3_4_0 too because it's just at alpha; the
same until this branch advances to the rc level. I noticed you created several branches preparing
for the 3.4.0 release.
Are there any guidelines for merging? For instance, when I fix a bug
in QA_3_3, should it be applied to MAINT_3_4, QA_3_4 and master?
Or will from now on, only security fixes be applied to QA_3_3?
As it will take some time to release 3.4, it makes sense to apply
patches to both of them.
The easiest way to do that is to commit to QA_3_3 first, then merge it
to QA_3_4 and then to master:
git checkout QA_3_3
edit foo.php
git add foo.php
git commit -m 'Fix something'
git checkout QA_3_4
git merge QA_3_3
git checkout master
git merge QA_3_4
10:52 a.m.
Dieter Adriaenssens a écrit :
Hi,
2010/11/23 Michal Čihař <michal(a)cihar.com>om>:
Yes but if a bug
- is not critical
- can wait a few weeks
- makes more sense to fix in 3.4
- causes too many conflicts between the two families
you can skip the 3.3 part.
--
Marc Delisle
http://infomarc.info
Dne Tue, 23 Nov 2010 05:18:53 -0500
Marc Delisle <marc(a)infomarc.info> napsal(a):
So for now, the order for merging should be QA_3_3 -> MAINT_3_4_0 ->
QA_3_4 -> master, if I'm not mistaken?
Kind regards, Le 2010-11-23 05:03, Michal Čihař a écrit :
Indeed it should be there as
well. Hi
Dne Tue, 23 Nov 2010 10:55:57 +0100
Dieter Adriaenssens <dieter.adriaenssens(a)gmail.com> napsal(a):
> I noticed you created several branches preparing for the 3.4.0 release.
> Are there any guidelines for merging? For instance, when I fix a bug
> in QA_3_3, should it be applied to MAINT_3_4, QA_3_4 and master?
> Or will from now on, only security fixes be applied to QA_3_3?
As it will take some time to release 3.4, it makes sense to apply
patches to both of them.
The easiest way to do that is to commit to QA_3_3 first, then merge it
to QA_3_4 and then to master:
git checkout QA_3_3
edit foo.php
git add foo.php
git commit -m 'Fix something'
git checkout QA_3_4
git merge QA_3_3
git checkout master
git merge QA_3_4
I would apply the fix to MAINT_3_4_0 too because it's just at
alpha; the
same until this branch advances to the rc level.
5037
days inactive
5037
days old
5 comments
3 participants
participants (3)
-
Dieter Adriaenssens -
Marc Delisle -
Michal Čihař