From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22288 invoked by alias); 30 Oct 2013 21:57:26 -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 22269 invoked by uid 89); 30 Oct 2013 21:57:25 -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-wg0-f50.google.com Received: from mail-wg0-f50.google.com (HELO mail-wg0-f50.google.com) (74.125.82.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 30 Oct 2013 21:57:20 +0000 Received: by mail-wg0-f50.google.com with SMTP id n12so1961808wgh.29 for ; Wed, 30 Oct 2013 14:57:16 -0700 (PDT) X-Received: by 10.180.75.39 with SMTP id z7mr932699wiv.9.1383170236576; Wed, 30 Oct 2013 14:57:16 -0700 (PDT) MIME-Version: 1.0 Received: by 10.194.7.169 with HTTP; Wed, 30 Oct 2013 14:56:56 -0700 (PDT) In-Reply-To: References: <526EE4B8.5010209@colorado.edu> From: Rhys Ulerich Date: Wed, 30 Oct 2013 21:57:00 -0000 Message-ID: Subject: Re: 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/msg00003.txt.bz2 Just an update, bzr is turned off in the Savannah. > 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. Along those lines, up on Savannah git I've got three branches in place: develop-1: Trunk for GSL 1.x releases develop-2: Trunk for GSL 2.x releases master: Latest stable release, default branch on clone once 'oldmaster' is gone. I'm thinking we treat develop-1 like we've been treating bzr and develop-2 is the wild west for 2.x development. Bug fixes will need to go in both places. Thoughts? - Rhys