From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.179.196 with SMTP id br4cs240123icb; Wed, 1 Dec 2010 01:08:16 -0800 (PST) Received: by 10.42.166.131 with SMTP id o3mr2460385icy.370.1291194496034; Wed, 01 Dec 2010 01:08:16 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id j6si17544275qcu.62.2010.12.01.01.08.15; Wed, 01 Dec 2010 01:08:15 -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 90E041858363 for ; Wed, 1 Dec 2010 04:08:15 -0500 (EST) Received: from ping.pong.ch (ping.pong.ch [77.109.141.101]) by rubyforge.org (Postfix) with ESMTP id 717C61858112 for ; Wed, 1 Dec 2010 03:38:33 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by ping.pong.ch (Postfix) with ESMTP id 9287040CB4D5 for ; Wed, 1 Dec 2010 09:38:30 +0100 (CET) Received: from ping.pong.ch ([127.0.0.1]) by localhost (ping.pong.ch [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gFQabnR8hD82 for ; Wed, 1 Dec 2010 09:38:29 +0100 (CET) Received: from auth sender gaudenz@ping.pong.ch by ping.pong.ch (Postfix) with ESMTPSA id 0FEC140CB4C4 for ; Wed, 1 Dec 2010 09:38:29 +0100 (CET) Received: by meteor.durcheinandertal.local (Postfix, from userid 1000) id B1352E0A8E; Wed, 1 Dec 2010 09:37:58 +0100 (CET) From: Gaudenz Steinlin To: sup-devel In-reply-to: <1291097850-sup-6043@tilus.net> 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> <1291097850-sup-6043@tilus.net> Date: Wed, 01 Dec 2010 09:37:58 +0100 Message-Id: <1291192005-sup-7698@meteor.durcheinandertal.local> User-Agent: Sup/git MIME-Version: 1.0 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: , Content-Type: multipart/mixed; boundary="===============0657219338==" Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org --===============0657219338== Content-Transfer-Encoding: 8bit Content-Type: multipart/signed; boundary="=-1291192678-669062-3672-2389-1-="; protocol="application/pgp-signature" --=-1291192678-669062-3672-2389-1-= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Excerpts from Tero Tilus's message of Die Nov 30 07:22:48 +0100 2010: > 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). Thanks for clarifying this.At the moment this does not seem to reflect the current reality in the git repository. Master has quite a lot of commits next does not have. Also next has not been updated since several months. I guess this is due to the fact that there were no major code changes during the last months and therefore all the work has been done directly on master. = Gaudenz -- = Ever tried. Ever failed. No matter. Try again. Fail again. Fail better. ~ Samuel Beckett ~ --=-1291192678-669062-3672-2389-1-= Content-Disposition: attachment; filename="signature.asc" Content-Type: application/pgp-signature; name="signature.asc" --=-1291192678-669062-3672-2389-1-=-- --===============0657219338== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel --===============0657219338==--