URGENT: Need to decide what the dev branch is now called [Was: git migration complete]

[Andrew Stitcher]

On Thu, 2014-11-06 at 11:41 -0500, Rafael Schloming wrote:
 Hi Everyone,
 
 The git migration is complete. The svn repo is now read only. You can find
 instructions for accessing the git repo here:
 
 https://git-wip-us.apache.org/

There appears to be a problem already with the migration!

Previously when the git repo was a mirror or the svn repo we used the
branch name trunk as the ongoing development branch.

Since the migration there has been a bunch of work checked in the a new
branch called master (which is the usual git default branch).

This would be less of a problem if the new branch came from the tip of
trunk. However the branches diverge at the 0.8 tag.

As a matter of urgency we need to decide which is the real development
branch name and merge the other branch onto it, then delete the branch
we are not using.

In keeping with our project history I suggest we use trunk, but I
don't actually care, we just need to decide on one or the other.

Andrew

Re: URGENT: Need to decide what the dev branch is now called [Was: git migration complete]

[Andrew Stitcher]

On Thu, 2014-11-06 at 14:54 -0500, Andrew Stitcher wrote:
 On Thu, 2014-11-06 at 11:41 -0500, Rafael Schloming wrote:
  Hi Everyone,
  
  The git migration is complete. The svn repo is now read only. You can find
  instructions for accessing the git repo here:
  
  https://git-wip-us.apache.org/
 
 There appears to be a problem already with the migration!

Ah, no actual problem here! The dev branch is now called
master (unless we want to change it back for nostalgia's sake!)

Remember to run git remote prune origin if you are changing the url of
an existing remote in an existing working repo. And then git checkout
master

Sorry for the fuss.

Andrew