From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1190908agb; Tue, 29 Dec 2009 12:43:22 -0800 (PST) Received: by 10.224.126.209 with SMTP id d17mr8301204qas.263.1262119401749; Tue, 29 Dec 2009 12:43:21 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 10si19289343qyk.109.2009.12.29.12.43.21; Tue, 29 Dec 2009 12:43:21 -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 56AFD1D78862; Tue, 29 Dec 2009 15:43:21 -0500 (EST) Received: from entry.masanjin.net (masanjin.net [209.20.72.13]) by rubyforge.org (Postfix) with ESMTP id 32B6615B8029 for ; Tue, 29 Dec 2009 15:43:16 -0500 (EST) Received: from w by entry.masanjin.net with local (Exim 4.69) (envelope-from ) id 1NPiuR-0005Wb-Md for sup-devel@rubyforge.org; Tue, 29 Dec 2009 12:43:16 -0800 From: William Morgan To: sup-devel In-reply-to: <1262117270-sup-1009@tilus.net> References: <1262114695-sup-9446@tilus.net> <1262116690-sup-8655@masanjin.net> <1262117270-sup-1009@tilus.net> Date: Tue, 29 Dec 2009 12:43:15 -0800 Message-Id: <1262118710-sup-1729@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: > Wiki page just doesn't say anything on how to have your own daily-sup > branch (master or next + a set of own and others' patches) and how to > keep that up-to-date with upstream while your develop your own patches > (which are supposed to live in topic branches). You should be able to make a daily-sup branch off of (say) next, apply all your patches, and whenever next changes and you want to update, rebase like so: $ git checkout next $ git pull $ git checkout daily-sup $ git rebase next If you have feature branches merged into daily-sup, I think you need to use `git rebase -p next` to get it to recreate those merges. But I've never gotten that complex. (You could also just merge in next each time, which might be easier. Rebase has the advantage of keeping your patch set up to date with the remote branch, though, which might be nice if you decide to publish them.) -- William _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel