From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19679 invoked by alias); 28 Oct 2013 22:27:08 -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 19667 invoked by uid 89); 28 Oct 2013 22:27:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: ipmx5.colorado.edu Received: from ipmx5.colorado.edu (HELO ipmx5.colorado.edu) (128.138.128.235) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 28 Oct 2013 22:27:06 +0000 From: Patrick Alken Received: from bonanza.ngdc.noaa.gov ([140.172.179.41]) by smtp.colorado.edu with ESMTP/TLS/DHE-RSA-AES256-SHA; 28 Oct 2013 16:27:04 -0600 Message-ID: <526EE4B8.5010209@colorado.edu> Date: Mon, 28 Oct 2013 22:27:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130912 Thunderbird/17.0.9 MIME-Version: 1.0 To: gsl-discuss@sourceware.org Subject: Re: Used git-bzr-ng to import bzr trunk into git master on Savannah References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2013-q4/txt/msg00001.txt.bz2 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/