Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id i9J8oaDp022531 for ; Tue, 19 Oct 2004 08:50:36 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id 76BCC53852 for ; Tue, 19 Oct 2004 08:50:35 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CJpon-00076b-1Y for migo@homemail.com; Tue, 19 Oct 2004 04:58:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CJpmy-0006yW-Ts for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 04:56:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CJpms-0006xL-5f for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 04:56:13 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CJpmr-0006xB-Ib for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 04:56:09 -0400 Received: from [80.68.91.238] (helo=ggtl.org) by monty-python.gnu.org with esmtp (TLSv1:RC4-SHA:128) (Exim 4.34) id 1CJpey-0004p6-3U for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 04:48:00 -0400 Received: from stig by ggtl.org with local (Exim 4.34) id 1CJpev-0001mo-Km for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 09:47:57 +0100 Date: Tue, 19 Oct 2004 09:47:57 +0100 From: Stig Brautaset To: gnu-arch-users@gnu.org Subject: Re: [Gnu-arch-users] a second branch Message-ID: <20041019084757.GC6772@stig.vm.bytemark.co.uk> Mail-Followup-To: gnu-arch-users@gnu.org References: <1098167338.19575.161.camel@whiskas.cashpoolcomps.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1098167338.19575.161.camel@whiskas.cashpoolcomps.com> User-Agent: Mutt/1.5.6+20040907i X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 1123 Lines: 37 On Tue, Oct 19, 2004 at 04:28:59PM +1000, Zenaan Harkness wrote: > OK, I have a simple setup: > > stable > / \ > developer1 developer2 ... > Now, I have a change that will take me a good week or may be three, and > I want to develop this in a new branch, so I can make bug fixes in my > regular branch. ... > Should I tag off of developer1 (my dev branch) or tag another branch off > of stable? I'd tag off stable. > If the former, then do I just star-merge the changes once completed into > stable, or into my developer1 branch and then into stable? If you tag from your branch then you should probably star-merge into your branch before merging into stable. Or, you could use star-merge with the --reference option. > If none of it matters, are there any consequences to the alternatives? Basically, pick where/how you want to resolve potential conflicts... Stig _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/