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

[Peter Bex]

On Wed, Dec 06, 2017 at 09:54:23PM +1300, Evan Hanson wrote:
> On 2017-12-05 22:44, address@hidden wrote:
> > > 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.
> 
> I agree, we should absolutely just rename the branches.
> 
>  git branch -m master chicken-4
>  git branch -m chicken-5 master
> 
> We're a small team so I think everyone involved should just run these
> commands and be done with it. Someone will need to do this on the
> repository on call-cc.org, too.
> 

I've been thinking about this some more, but what happens when we want
to make a release?  We'd merge master into prerelease, which won't work
and then prerelease into release, which won't work either.

Then later, if we ever want to restore the stability branch, we'd have
to merge release into that, which won't work either.

I've done another test, and I think this might be the better approach:

  $ git checkout chicken-5
  $ git merge master  # Just ignore all conflicts and stuff
  $ rm -rf *  # but not .git
  $ git checkout chicken-5 .
  $ git add .
  $ git commit

After this, the branch can be cleanly merged into master.

Cheers,
Peter

signature.asc
Description: PGP signature