From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16681 invoked by alias); 29 Oct 2013 02:33:22 -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 16661 invoked by uid 89); 29 Oct 2013 02:33:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f176.google.com Received: from mail-we0-f176.google.com (HELO mail-we0-f176.google.com) (74.125.82.176) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 29 Oct 2013 02:33:20 +0000 Received: by mail-we0-f176.google.com with SMTP id w62so7493049wes.21 for ; Mon, 28 Oct 2013 19:33:16 -0700 (PDT) X-Received: by 10.180.187.236 with SMTP id fv12mr11589313wic.20.1383013996657; Mon, 28 Oct 2013 19:33:16 -0700 (PDT) MIME-Version: 1.0 Received: by 10.194.7.169 with HTTP; Mon, 28 Oct 2013 19:32:56 -0700 (PDT) In-Reply-To: <526EE4B8.5010209@colorado.edu> References: <526EE4B8.5010209@colorado.edu> From: Rhys Ulerich Date: Tue, 29 Oct 2013 02:33:00 -0000 Message-ID: Subject: Re: Used git-bzr-ng to import bzr trunk into git master on Savannah To: Patrick Alken Cc: gsl-discuss@sourceware.org Content-Type: text/plain; charset=ISO-8859-1 X-SW-Source: 2013-q4/txt/msg00002.txt.bz2 > Looks good after a quick glance. I'll take that as a yay vote. After some digging, it seems I can't make the HEAD symbolic reference point to master instead of oldmaster without some help. Patrick, would you please ask the Savannah folks about this? I suspect them running git symbolic-ref HEAD would show refs/heads/oldmaster whereas we want that to now say refs/heads/master which (I think) requires issuing git symbolic-ref -m "Making updated master the default HEAD" HEAD refs/heads/master assuming ten minutes of Googling is enough background reading. Once that's confirmed as done, I'll remove the existing oldmaster branch. > 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. I believe I have this fixed. Please confirm that git clone git://git.savannah.gnu.org/gsl.git cd gsl git tag -l shows tags for release-1-15 and release-1-16. Also http://git.savannah.gnu.org/cgit/gsl.git/refs/?h=master is now showing these entries. > 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. I think only admins get that option in the Savannah UI. > 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. I'd rather not use two separate VCSes if we can avoid it. Maybe we can have a develop-1 for 1.x, master for stable 1.x, and a develop-2 for 2.x. That would let folk play with 2.x so that we can revisit this decision in the context of tangible code changes. For now, there's enough 1.17-ish things to keep me busy in my freetime. In particular, I'd like to get Konrad's hermite polynomials up in a branch so they can be reviewed before being merged. - Rhys