From: Rhys Ulerich <rhys.ulerich@gmail.com>
To: gsl-discuss@sourceware.org
Subject: Used git-bzr-ng to import bzr trunk into git master on Savannah
Date: Mon, 28 Oct 2013 22:03:00 -0000 [thread overview]
Message-ID: <CAKDqugQZWJQn4nx2syuQQYf-JKqZ0irNgyr4R4=omHNPa_nHng@mail.gmail.com> (raw)
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/
next reply other threads:[~2013-10-28 22:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-28 22:03 Rhys Ulerich [this message]
2013-10-28 22:27 ` Patrick Alken
2013-10-29 2:33 ` Rhys Ulerich
2013-10-30 21:57 ` Rhys Ulerich
2013-10-30 22:16 ` Brian Gladman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKDqugQZWJQn4nx2syuQQYf-JKqZ0irNgyr4R4=omHNPa_nHng@mail.gmail.com' \
--to=rhys.ulerich@gmail.com \
--cc=gsl-discuss@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).