Tweaking the branches (swapping devel and master, essentially)

[Michael DeHaan]

Ok,

I probably want to do this for the wrong reasons, but I have about three 
of them.

Currently the github impact graph shows activity over time.    The thing 
is, it only really shows information for the master branch.    The 
master branch isn't where the action is.

We also have a problem in that we have only one stable branch, since by 
convention it's master.

Further, people tend to not know about devel.  I want them to know about 
devel by default if they are trying to write a patch, rather than 
missing instructions and writing a patch
against master.

So, what I'm going to try to do is this ... make master the new devel... 
and make master "cobbler16".

This could also cover the (possible) contingency of what happens when 
Satellite is out and needs a fix on 1.6 when 2.0 has already gone stable 
and needs only
certain fixes (I wouldn't expect anyone to maintain such a branch but 
me).   We flirted this earlier with a "sustain14" branch, which we 
didn't need, but this gets us into the habit of doing it. 

This may mix folks git repos up a /small/ amount.    I'm going to play 
around and see what happens before I push it.

--Michael

[Scott Henson]

On 05/29/2009 10:45 AM, Michael DeHaan wrote:
>  Ok,
>
>  I probably want to do this for the wrong reasons, but I have about three
>  of them.
>
>  Currently the github impact graph shows activity over time.    The thing
>  is, it only really shows information for the master branch.    The
>  master branch isn't where the action is.
>
>  We also have a problem in that we have only one stable branch, since by
>  convention it's master.
>
>  Further, people tend to not know about devel.  I want them to know about
>  devel by default if they are trying to write a patch, rather than
>  missing instructions and writing a patch
>  against master.
>
>  So, what I'm going to try to do is this ... make master the new devel...
>  and make master "cobbler16".
>
>  This could also cover the (possible) contingency of what happens when
>  Satellite is out and needs a fix on 1.6 when 2.0 has already gone stable
>  and needs only
>  certain fixes (I wouldn't expect anyone to maintain such a branch but
>  me).   We flirted this earlier with a "sustain14" branch, which we
>  didn't need, but this gets us into the habit of doing it.
>
>  This may mix folks git repos up a /small/ amount.    I'm going to play
>  around and see what happens before I push it.
>      
+1 this makes perfect sense to me.

-- 
Scott Henson
Red Hat CIS Operator
WVU Alum BSAE/BSME

[Michael DeHaan]

Scott Henson wrote:
>  On 05/29/2009 10:45 AM, Michael DeHaan wrote:
>    
> > Ok,
> >
> > I probably want to do this for the wrong reasons, but I have about three
> > of them.
> >
> > Currently the github impact graph shows activity over time.    The thing
> > is, it only really shows information for the master branch.    The
> > master branch isn't where the action is.
> >
> > We also have a problem in that we have only one stable branch, since by
> > convention it's master.
> >
> > Further, people tend to not know about devel.  I want them to know about
> > devel by default if they are trying to write a patch, rather than
> > missing instructions and writing a patch
> > against master.
> >
> > So, what I'm going to try to do is this ... make master the new devel...
> > and make master "cobbler16".
> >
> > This could also cover the (possible) contingency of what happens when
> > Satellite is out and needs a fix on 1.6 when 2.0 has already gone stable
> > and needs only
> > certain fixes (I wouldn't expect anyone to maintain such a branch but
> > me).   We flirted this earlier with a "sustain14" branch, which we
> > didn't need, but this gets us into the habit of doing it.
> >
> > This may mix folks git repos up a /small/ amount.    I'm going to play
> > around and see what happens before I push it.
> >    
> >     
>
>  +1 this makes perfect sense to me.
>
>     
It is done. Pretty easy actually.

The new stable branch for the 1.6.X series is called "release1.6", 
things will still be tagged for each dot release on that branch.
The new devel branch is "master"

The previous remote branches for master and devel both have been deleted 
from both github and fedorahosted.org

For those who have remote branches, you'll probably want to tweak your 
.git/config files in your local checkout so they track the right remote 
repo, but otherwise things should still work fine and you shouldn't have 
to rename anything.

--Michael