From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1196702agb; Tue, 29 Dec 2009 14:51:15 -0800 (PST) Received: by 10.229.29.204 with SMTP id r12mr7302239qcc.72.1262127075395; Tue, 29 Dec 2009 14:51:15 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 36si5457480qyk.92.2009.12.29.14.51.15; Tue, 29 Dec 2009 14:51: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 18FE416782B8; Tue, 29 Dec 2009 17:51:15 -0500 (EST) Received: from entry.masanjin.net (masanjin.net [209.20.72.13]) by rubyforge.org (Postfix) with ESMTP id 7427F1858289 for ; Tue, 29 Dec 2009 17:51:12 -0500 (EST) Received: from w by entry.masanjin.net with local (Exim 4.69) (envelope-from ) id 1NPkuG-0007dl-BB for sup-devel@rubyforge.org; Tue, 29 Dec 2009 14:51:12 -0800 From: William Morgan To: sup-devel In-reply-to: <1262123514-sup-7661@tilus.net> References: <1262114695-sup-9446@tilus.net> <1262116690-sup-8655@masanjin.net> <1262117270-sup-1009@tilus.net> <1262118240-sup-4202@ntdws12.chass.utoronto.ca> <1262123514-sup-7661@tilus.net> Date: Tue, 29 Dec 2009 14:51:12 -0800 Message-Id: <1262126992-sup-7312@masanjin.net> User-Agent: Sup/git Subject: Re: [sup-devel] What's your workflow? 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 Tero Tilus's message of 2009-12-29: > Does it "just work" if I have feature branches off of master which are > merged to mybranch and the feature patches get accepted and appear to > next? It certainly works for the case where you're merging from next into your daily_sup branch, and rebase will happily drop changes that are duplicated by the target, so I would guess that rebase would do the right thing with redundant merges. Maybe a test is in order! -- William _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel