Re: Used git-bzr-ng to import bzr trunk into git master on Savannah

[Patrick Alken <patrick dot alken at Colorado dot EDU>]

Looks good after a quick glance. Just a few notes:

1. Unfortunately it looks like the tags weren't preserved past 1.14 (ie: 
release-1-15 and release-1-16 don't appear to be tagged in the git. This 
isn't terrible since we can always go back to the bzr for them if 
needed. Maybe bzr tags things in a way which isn't compatible with git.

2. We can turn off bzr whenever we want (its in the Main -> Select 
Features menu on savannah) - the savannah people renamed the old git to 
'oldmaster' for us, that we couldn't do on our own.

3. Still not sure about the 2.x issue. Another option is to continue 
using the bzr for the 1.x version and use the git to get started on 2.x 
features. Don't know if this would just make things more complicated.

Patrick

On 10/28/2013 04:02 PM, Rhys Ulerich wrote:
> Hi all,
>
> Per the git-migration discussion we've been having intermittently...
>
> After Patrick got the Savannah admins to bring up git for the GSL
> project, I used git-bzr-ng [1] to import bzr trunk [2] into git master
> [3].  If you browse our source tree for git [4], you'll see an
> 'oldmaster' branch and a 'master' branch in the upper right hand side
> of the screen.  'master' is the default, it seems.  You can convince
> yourself that oldmaster is indeed old [5] and master is indeed new
> [6].
>
> If someone will second the idea after having reviewed these things, I
> will delete the 'oldmaster' branch.
>
> Two things likely remain for the migration to be complete:
>    1) A polite discussion on how we want to name branches.  Is 'master'
> always the latest stable release with 'develop' being the work in
> progress?  Should be adopt something like git-flow [7]?  What do we do
> for having a 1.x support 'master' alongside a 2.x 'master'?
>    2) Asking the Savannah admins to turn off bzr.
>
> - Rhys
>
> [1] https://github.com/termie/git-bzr-ng
> [2] bzr+ssh://rhysu@bzr.savannah.gnu.org/gsl/trunk/
> [3] rhysu@git.sv.gnu.org:/srv/git/gsl.git
> [4] http://git.savannah.gnu.org/cgit/gsl.git
> [5] http://git.savannah.gnu.org/cgit/gsl.git/log/?h=oldmaster
> [6] http://git.savannah.gnu.org/cgit/gsl.git/log/?h=master
> [7] http://nvie.com/posts/a-successful-git-branching-model/