From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.240.136 with SMTP id la8cs160927icb; Thu, 10 Feb 2011 16:08:36 -0800 (PST) Received: by 10.151.41.9 with SMTP id t9mr46148ybj.113.1297382915734; Thu, 10 Feb 2011 16:08:35 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id r19si293097qcs.152.2011.02.10.16.08.35; Thu, 10 Feb 2011 16:08:35 -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 46AAF18583B5; Thu, 10 Feb 2011 19:08:35 -0500 (EST) Received: from masanjin.net (masanjin.net [209.20.72.13]) by rubyforge.org (Postfix) with ESMTP id 7E243185838A for ; Thu, 10 Feb 2011 19:00:31 -0500 (EST) Received: from w by masanjin.net with local (Exim 4.71) (envelope-from ) id 1PngRq-0006hU-Ez for sup-devel@rubyforge.org; Fri, 11 Feb 2011 00:01:19 +0000 From: William Morgan To: sup-devel In-reply-to: <1297380057-sup-9005@whisper> References: <1297380057-sup-9005@whisper> Date: Fri, 11 Feb 2011 00:01:17 +0000 Message-Id: <1297381879-sup-6069@masanjin.net> User-Agent: Sup/git Subject: Re: [sup-devel] branching and merging 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 Reformatted excerpts from Hamish's message of 2011-02-10: > But I'm wondering when a merge has been done from a branch, should > development continue on that branch? If it's essentially more work on the same feature, then yes, continue on that branch. Otherwise, no. Branches are cheap. The point of a feature branch is that you can merge or not merge or revert it without touching other features. So that should be the deciding factor on whether to start a new feature branch: if I have to throw away, or if I have to revert this whole branch, will I be losing extra stuff? The other option is that if it's a long-running set of related and dependent features, you can also call it an integration branch, merge individual feature branches into it as necessary, and finally merge the whole thing into master in one go. I haven't been following the gpgme changes, but it sounds like maybe this is the case. -- William _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel