From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1194481agb; Tue, 29 Dec 2009 13:58:51 -0800 (PST) Received: by 10.224.127.13 with SMTP id e13mr8368865qas.295.1262123930994; Tue, 29 Dec 2009 13:58:50 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 40si19229096qyk.93.2009.12.29.13.58.50; Tue, 29 Dec 2009 13:58:50 -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 88EFE15B802E; Tue, 29 Dec 2009 16:58:50 -0500 (EST) Received: from kuovi.tilus.net (kuovi.tilus.net [80.68.89.168]) by rubyforge.org (Postfix) with ESMTP id 0119E15B8029 for ; Tue, 29 Dec 2009 16:58:47 -0500 (EST) Received: by kuovi.tilus.net (Postfix, from userid 1000) id 52C5B3FCCC; Tue, 29 Dec 2009 23:58:47 +0200 (EET) From: Tero Tilus To: sup-devel In-reply-to: <1262118240-sup-4202@ntdws12.chass.utoronto.ca> References: <1262114695-sup-9446@tilus.net> <1262116690-sup-8655@masanjin.net> <1262117270-sup-1009@tilus.net> <1262118240-sup-4202@ntdws12.chass.utoronto.ca> Date: Tue, 29 Dec 2009 23:58:47 +0200 Message-Id: <1262123514-sup-7661@tilus.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 Ben Walton, 2009-12-29 22:40: > Maybe something like Stacked Git would work for you? > http://www.procode.org/stgit/ Now _that_ is something i've been dreaming of! Thanks a lot. Even if I don't end up using stgit on sup development, I know I'll use it in quite a few other places. > Alternately, if you want to stick to plain git, I'd recommend > something like: > > origin/master -> master > origin/next -> next > | > \ mybranch > > Where 'mybranch' collects your locally desired deviations. 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? -- Tero Tilus ## 050 3635 235 ## http://tero.tilus.net/ _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel