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 i9TKq6NF011206 for ; Fri, 29 Oct 2004 20:52:06 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id E7DBC5363C for ; Fri, 29 Oct 2004 20:52:05 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CNdqo-00074y-QT for migo@homemail.com; Fri, 29 Oct 2004 16:59:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CNdqQ-00074s-3K for gnu-arch-users@gnu.org; Fri, 29 Oct 2004 16:59:34 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CNdqP-00074g-LL for gnu-arch-users@gnu.org; Fri, 29 Oct 2004 16:59:33 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CNdqP-00074d-HA for gnu-arch-users@gnu.org; Fri, 29 Oct 2004 16:59:33 -0400 Received: from [80.91.229.2] (helo=main.gmane.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CNdhq-0005E1-Ce for gnu-arch-users@gnu.org; Fri, 29 Oct 2004 16:50:42 -0400 Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1CNdho-00016v-00 for ; Fri, 29 Oct 2004 22:50:40 +0200 Received: from anyanka.rfc1149.net ([81.56.47.149]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 29 Oct 2004 22:50:40 +0200 Received: from sam by anyanka.rfc1149.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 29 Oct 2004 22:50:40 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: gnu-arch-users@gnu.org From: Samuel Tardieu Date: 29 Oct 2004 22:47:09 +0200 Organization: Avian Carrier & Friends Message-ID: <87pt31s14i.fsf@beeblebrox.rfc1149.net> References: <20041025210724.GA19744@merconline.com> <87r7nir5cf.fsf@deneb.enyo.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: anyanka.rfc1149.net User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 X-Leafnode-NNTP-Posting-Host: 2001:660:330f:f810:200:39ff:fe25:3aa2 Subject: [Gnu-arch-users] Re: Potential flaw in patch-log pruning in proposal 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: 1040 Lines: 21 >>>>> "Florian" == Florian Weimer writes: Florian> Tom proposed an elaborate scheme involving a hierarchy of Florian> branches with constrained merging. After reading the thread and Tom's document, I can't see how I'll be able to: - have a branch in which I develop feature or bugfix X for TLA - have a branch in which I keep all my tla changes with the "tla" I use daily - merge X into my main branch for integration testing with my other changes and for daily use - merge TLA devo branch into my main branch to keep up-to-date with TLA development version and not pull my changes *again* if TLA devo branch doesn't keep patch logs coming from my X branch as --skip-present will not detect those Sam -- Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/sam _______________________________________________ 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/