Re: [Chicken-hackers] Merge chicken-5 into master? Also: git help needed

[felix . winkelmann]

> > Just a quick question: Now that we've started the 4.13.0 release
> > process, should we branch off a "chicken-4" branch from master
> > and merge "chicken-5" into master?
> >
> > If we decide to do so, how does that work, exactly?  I just tried
> > and it can be done relatively easily with the following sequence:
> >
> >   $ git checkout master
> >   $ rm -rf *  # This will ignore .git in my zsh config
> >   $ git checkout chicken-5 .  # Check out chicken-5 files into master
> >   $ git add .  # Add any new files, remove any deleted ones
> >
> > I'm just not sure whether that's the best way to do this kind of thing,
> > given that you'd probably lose any sort of merge tracking info at all,
> > and it will probably produce quite a big commit.
>
> This will also loose all history information from the chicken-5
> branch prior to the source drop.
>
> I think the easiest way for us would be to rename the master branch
> to chicken-4.x then rename the chicken-5 branch to master.
>
> For bug reports etc the commit hashes would still be the same so
> we can support chicken-4 for a while without too much hassle.
>
> The only downside is that people would have to do this on their
> machines locally as well (or just throw away the master branch)
> otherwise pushing will always fail. But that is more of a communication
> issue.
>
> After trying to merge this for a bit I think we should just do the
> renaming and be done.

I think Christian is right here. If things fail locally, one can still do
a fresh checkout as a last resort. Git will just fuck up things, if
we let it.


felix