From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6850 invoked by alias); 30 Oct 2013 22:16:23 -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 6838 invoked by uid 89); 30 Oct 2013 22:16:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: avasout06.plus.net Received: from avasout06.plus.net (HELO avasout06.plus.net) (212.159.14.18) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 30 Oct 2013 22:16:17 +0000 Received: from [192.168.1.16] ([212.159.26.30]) by avasout06 with smtp id jaGD1m0010eyEos01aGET3; Wed, 30 Oct 2013 22:16:14 +0000 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.1 cv=CuqGLBID c=1 sm=1 tr=0 a=nO6JWm9Dsne7RoCvRGnC0w==:117 a=nO6JWm9Dsne7RoCvRGnC0w==:17 a=0Bzu9jTXAAAA:8 a=uhLmLRWzFCcA:10 a=kd0EcjyxeLUA:10 a=ihvODaAuJD4A:10 a=8nJEP1OIZ-IA:10 a=EBOSESyhAAAA:8 a=WkV2ykclMSIA:10 a=pdv688h1hY7yptp-WiIA:9 a=wPNLvfGTeEIA:10 X-AUTH: gladman+brg:2500 Message-ID: <5271852E.8040304@gladman.plus.com> Date: Wed, 30 Oct 2013 22:16:00 -0000 From: Brian Gladman User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Rhys Ulerich , gsl-discuss@sourceware.org Subject: Re: Used git-bzr-ng to import bzr trunk into git master on Savannah References: <526EE4B8.5010209@colorado.edu> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SW-Source: 2013-q4/txt/msg00004.txt.bz2 On 30/10/2013 21:56, Rhys Ulerich wrote: > 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? Great work Rhys, its great to be able to use GIT for GSL development - I much appreciate your efforts on this. The arrangement you suggest should work well. I haven't tried a commit yet but this has worked with other GIT repos so I would not expect to have any problems with this. Brian