In the past we used to wait to branch spin-kickstarts until almost the next release. This was because it avoided having to do commits to two branches (in most cases) and with very little work being done specifically for the release past the next one.
For F17 we did the branch close to when the release branched. It was anticipated that some F18 work would be going on before F17 was released. There didn't appear to be many issues as a result of this change. People seemed to remember to commit to both branches. Git makes this easier than perhaps it would have been under CVS. We did have one case where a merge of master back into F17 was done instead of cherry picking, but that wasn't too hard to fix.
Given that background, what would people like to see happen for F18?
I am slightly in favor of branching now, but if most want to wait until some F19 specific changes are needed, that would be OK with me.
On Aug 15, 2012 6:33 PM, "Bruno Wolff III" bruno@wolff.to wrote:
In the past we used to wait to branch spin-kickstarts until almost the
next release. This was because it avoided having to do commits to two branches (in most cases) and with very little work being done specifically for the release past the next one.
For F17 we did the branch close to when the release branched. It was
anticipated that some F18 work would be going on before F17 was released.
There didn't appear to be many issues as a result of this change. People
seemed to remember to commit to both branches. Git makes this easier than perhaps it would have been under CVS. We did have one case where a merge of master back into F17 was done instead of cherry picking, but that wasn't too hard to fix.
Given that background, what would people like to see happen for F18?
I am slightly in favor of branching now, but if most want to wait until
some F19 specific changes are needed, that would be OK with me.
I'd prefer to branch too please.
Peter _______________________________________________
spins mailing list spins@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/spins
On Wed, 15 Aug 2012 12:31:37 -0500 Bruno Wolff III bruno@wolff.to wrote:
In the past we used to wait to branch spin-kickstarts until almost the next release. This was because it avoided having to do commits to two branches (in most cases) and with very little work being done specifically for the release past the next one.
For F17 we did the branch close to when the release branched. It was anticipated that some F18 work would be going on before F17 was released. There didn't appear to be many issues as a result of this change. People seemed to remember to commit to both branches. Git makes this easier than perhaps it would have been under CVS. We did have one case where a merge of master back into F17 was done instead of cherry picking, but that wasn't too hard to fix.
Given that background, what would people like to see happen for F18?
I am slightly in favor of branching now, but if most want to wait until some F19 specific changes are needed, that would be OK with me.
I'd be fine with branching now...
I think it's less confusing and matches our other processes better.
kevin
On 15/08/2012 19:31, Bruno Wolff III wrote:
In the past we used to wait to branch spin-kickstarts until almost the next release. This was because it avoided having to do commits to two branches (in most cases) and with very little work being done specifically for the release past the next one.
For F17 we did the branch close to when the release branched. It was anticipated that some F18 work would be going on before F17 was released. There didn't appear to be many issues as a result of this change. People seemed to remember to commit to both branches. Git makes this easier than perhaps it would have been under CVS. We did have one case where a merge of master back into F17 was done instead of cherry picking, but that wasn't too hard to fix.
Given that background, what would people like to see happen for F18?
I am slightly in favor of branching now, but if most want to wait until some F19 specific changes are needed, that would be OK with me. _______________________________________________ spins mailing list spins@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/spins
+1 for branching
On Wed, Aug 15, 2012 at 12:31:37 -0500, Bruno Wolff III bruno@wolff.to wrote:
I am slightly in favor of branching now, but if most want to wait until some F19 specific changes are needed, that would be OK with me.
Since the consensus seems to be to branch now, I created branch 'f18' from master.
I haven't switched over the nightly build stuff to use f18 instead of master.
People should remember to make commits to both f18 and master where appropriate. You don't want to use merge, since that may bring in commits only intended for one of these branches. cherry-pick seems to work well for me.
----- Original Message -----
On Wed, Aug 15, 2012 at 12:31:37 -0500, Bruno Wolff III bruno@wolff.to wrote:
I am slightly in favor of branching now, but if most want to wait until some F19 specific changes are needed, that would be OK with me.
Since the consensus seems to be to branch now, I created branch 'f18' from master.
I haven't switched over the nightly build stuff to use f18 instead of master.
People should remember to make commits to both f18 and master where appropriate. You don't want to use merge, since that may bring in commits only intended for one of these branches. cherry-pick seems to work well for me.
Ok. As it seems like a good idea, it matches our process - we should do it regularly. I think branch time is a best time for ks branch too. What do you think? Spins should be submitted/identified by that time too, so I don't see collision here. If it's ok for you, I'll update F19 schedule to reflect it.
Jaroslav
spins mailing list spins@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/spins
On Thu, Aug 16, 2012 at 03:04:34 -0400, Jaroslav Reznik jreznik@redhat.com wrote:
As it seems like a good idea, it matches our process - we should do it regularly. I think branch time is a best time for ks branch too. What do you think? Spins should be submitted/identified by that time too, so I don't see collision here. If it's ok for you, I'll update F19 schedule to reflect it.
I thunk branching spin-kickstarts at the same time as the release is the way we want to go.
-
Bruno Wolff III -
Jaroslav Reznik -
Jørn Loamx -
Kevin Fenzi -
Peter Robinson