From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.179.196 with SMTP id br4cs193672icb; Mon, 29 Nov 2010 22:52:29 -0800 (PST) Received: by 10.224.54.9 with SMTP id o9mr3944677qag.163.1291099948539; Mon, 29 Nov 2010 22:52:28 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id f23si14331408qcs.164.2010.11.29.22.52.28; Mon, 29 Nov 2010 22:52:28 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 1AD961678318 for ; Tue, 30 Nov 2010 01:52:28 -0500 (EST) Received: from kuovi.tilus.net (kuovi.tilus.net [80.68.89.168]) by rubyforge.org (Postfix) with ESMTP id D8D0C1858357 for ; Tue, 30 Nov 2010 01:22:49 -0500 (EST) Received: by kuovi.tilus.net (Postfix, from userid 1000) id D17B86016; Tue, 30 Nov 2010 08:22:48 +0200 (EET) From: Tero Tilus To: sup-devel In-reply-to: <1291023322-sup-8457@meteor.durcheinandertal.local> References: <1289466286-sup-7540@meteor.durcheinandertal.local> <1289907535-sup-3989@meteor.durcheinandertal.local> <1289932061-sup-96@meteor.durcheinandertal.local> <1291023322-sup-8457@meteor.durcheinandertal.local> Date: Tue, 30 Nov 2010 08:22:48 +0200 Message-Id: <1291097850-sup-6043@tilus.net> User-Agent: Sup/git Subject: Re: [sup-devel] [PATCH] Converted crypto to use the gpgme gem X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org Gaudenz Steinlin, 2010-11-29 11:41: > As far as I understood the branch layout the flow of changes is > master -> next -> release. So applying to next would mean it ends up > in the next release (0.12). Master is considered "stable" and next "unstable". Releases are tagged from master and small changes may go directly to master. New features are introduced in next and merged to master when they are considered stable (enough). Applying to next would mean it ends up in 0.13 (or later if there are bugfix releases). -- Tero Tilus ## 050 3635 235 ## http://tero.tilus.net/ _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel