amalgamated vs. master

[Clay Bridges]

Any update? Having just gone through a new build, I can only imagine what trouble this would be for somebody new to this distinction. Would it be worthwhile to make amalgamated the default branch?

[Tim Burks]

I think it would be good now to branch master into something else, like "gnustep" (since it's still gnustep compatible) and make amalgamated "master". It's probably an easy change but I haven't done that before with git. Advice or a pull request would be welcome :)

On Sat, Mar 24, 2012 at 11:22 AM, Clay Bridges <clayb...@gmail.com> wrote:

Any update? Having just gone through a new build, I can only imagine what trouble this would be for somebody new to this distinction. Would it be worthwhile to make amalgamated the default branch?

--
You received this message because you are subscribed to the Google Groups "Programming Nu" group.
To view this discussion on the web visit https://groups.google.com/d/msg/programming-nu/-/VxjgqM0XH4cJ.
To post to this group, send email to program...@googlegroups.com.
To unsubscribe from this group, send email to programming-n...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/programming-nu?hl=en.

[Clay Bridges]

As I understand it, on the remote you want to:

- create a gnustep branch pointing where master is (3489bd6)

- reset master to point where amalgamated is (30e5c09)

I did this for my fork @ https://github.com/claybridges/nu/network.

I couldn't find a way to package this branch-pokery as a pull request.

Here's the steps, as applied to your local repository. This assumes the github repository is remoted as "origin".

# adds gnustep branch at same place as master

git push origin master:gnustep

# At this point, good idea to double check that gnustep exists

# on github and points to the same place as master. This 

# makes a reset of master much safer.

# creates local tracking branch of gnustep (optional)

git branch gnustep origin/gnustep

# assuming you have a local {master,amalgamated} 

# branches tracking origin/{master,amalgamated}

# resets local master to amalgamated

git checkout master

git reset --hard amalgamated

# push that change up, forced

git push origin -f

[Luke Iannini]

Hi Tim,

It should be basically the easiest ever —
git checkout master
git branch gnustep #create a branch from the current state of master
git pull . amalgamated #merge amalgamated back into master
git push origin gnustep #push the branch to the internet

(then optionally, 'git branch -d amalgamated' to delete that branch)

Very best
Luke

[Tim Burks]

Clay/Luke,

Thanks! I followed Luke's steps and made a new "gnustep" branch for
the old "master".

Now "master" is the lion->amalgamated branch and a fresh clone should
build easily with the latest Lion (10.7.3) and developer tools (Xcode
4.3.1). The quick changes that I made to the clang path will break
builds for older Xcode releases. I think merging Clay's changes (on
amalgamated) will fix that but don't have a quick way to confirm that.

Tim