From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2324 invoked by alias); 28 Oct 2013 22:03:00 -0000 Mailing-List: contact gsl-discuss-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gsl-discuss-owner@sourceware.org Received: (qmail 2312 invoked by uid 89); 28 Oct 2013 22:02:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_50,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f43.google.com Received: from mail-wg0-f43.google.com (HELO mail-wg0-f43.google.com) (74.125.82.43) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 28 Oct 2013 22:02:57 +0000 Received: by mail-wg0-f43.google.com with SMTP id b13so7471103wgh.22 for ; Mon, 28 Oct 2013 15:02:54 -0700 (PDT) X-Received: by 10.181.12.104 with SMTP id ep8mr10812039wid.54.1382997774307; Mon, 28 Oct 2013 15:02:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.194.7.169 with HTTP; Mon, 28 Oct 2013 15:02:34 -0700 (PDT) From: Rhys Ulerich Date: Mon, 28 Oct 2013 22:03:00 -0000 Message-ID: Subject: Used git-bzr-ng to import bzr trunk into git master on Savannah To: gsl-discuss@sourceware.org Content-Type: text/plain; charset=ISO-8859-1 X-SW-Source: 2013-q4/txt/msg00000.txt.bz2 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/