Received: from spf5.us4.outblaze.com (spf5.us4.outblaze.com [205.158.62.27]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id i9J6Te6I023179 for ; Tue, 19 Oct 2004 06:29:40 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf5.us4.outblaze.com (Postfix) with ESMTP id CD66576EC1 for ; Tue, 19 Oct 2004 06:29:39 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CJncQ-00049A-Ag for migo@homemail.com; Tue, 19 Oct 2004 02:37:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CJnbt-00048N-SI for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 02:36:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CJnbs-00047i-6Q for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 02:36:40 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CJnbs-00047G-45 for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 02:36:40 -0400 Received: from [144.140.71.43] (helo=gizmo12ps.bigpond.com) by monty-python.gnu.org with smtp (Exim 4.34) id 1CJnU1-0004Jn-SX for gnu-arch-users@gnu.org; Tue, 19 Oct 2004 02:28:34 -0400 Received: (qmail 13571 invoked from network); 19 Oct 2004 06:28:30 -0000 Received: from unknown (HELO psmam11.bigpond.com) (144.135.25.100) by gizmo12ps.bigpond.com with SMTP; 19 Oct 2004 06:28:30 -0000 Received: from cpe-144-132-220-21.nsw.bigpond.net.au ([144.132.220.21]) by psmam11.bigpond.com(MAM REL_3_4_2a 225/116068841) with SMTP id 116068841; Tue, 19 Oct 2004 16:28:30 +1000 Received: by freedbms.net (Postfix, from userid 1000) id B1D4D3C078; Tue, 19 Oct 2004 16:28:59 +1000 From: Zenaan Harkness To: arch Content-Type: text/plain Content-Transfer-Encoding: 7bit Message-Id: <1098167338.19575.161.camel@whiskas.cashpoolcomps.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 Date: Tue, 19 Oct 2004 16:28:59 +1000 Subject: [Gnu-arch-users] a second branch 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: 1069 Lines: 39 OK, I have a simple setup: stable / \ developer1 developer2 with me being one of the developers, and the integrator that merges changes from each developer. Stable is our pivot branch, from and into which we star-merge. 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. I'm assuming I use tag. Should I tag off of developer1 (my dev branch) or tag another branch off of 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 none of it matters, are there any consequences to the alternatives? tia zen -- Homepage: http://www.soulsound.net/ Please respect the confidentiality of this email as sensibly warranted. _______________________________________________ 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/