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 iA98auQc013076 for ; Tue, 9 Nov 2004 08:36:56 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf5.us4.outblaze.com (Postfix) with ESMTP id 43939774AE for ; Tue, 9 Nov 2004 08:36:56 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRRdA-0000pi-F7 for migo@homemail.com; Tue, 09 Nov 2004 03:45:36 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CRRcI-0000pd-B0 for gnu-arch-users@gnu.org; Tue, 09 Nov 2004 03:44:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CRRcH-0000pR-Um for gnu-arch-users@gnu.org; Tue, 09 Nov 2004 03:44:42 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRRcH-0000pO-Af for gnu-arch-users@gnu.org; Tue, 09 Nov 2004 03:44:41 -0500 Received: from [66.187.233.31] (helo=mx1.redhat.com) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1CRRTf-0001IV-Lb for gnu-arch-users@gnu.org; Tue, 09 Nov 2004 03:35:47 -0500 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id iA98ZdWl022200 for ; Tue, 9 Nov 2004 03:35:44 -0500 Received: from pobox.tokyo.redhat.com (pobox.tokyo.redhat.com [172.16.33.225]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id iA98Zcr23121 for ; Tue, 9 Nov 2004 03:35:38 -0500 Received: from localhost (gls07.tokyo.redhat.com [172.16.32.104]) by pobox.tokyo.redhat.com (8.12.8/8.12.8) with ESMTP id iA98ZaOB004855 for ; Tue, 9 Nov 2004 17:35:36 +0900 Date: Tue, 09 Nov 2004 17:32:35 +0900 (JST) Message-Id: <20041109.173235.212066485.jet@gyve.org> To: gnu-arch-users@gnu.org Subject: Re: [Gnu-arch-users] conflict applying patch in arch_build_revision From: Masatake YAMATO In-Reply-To: <20041019.173452.175857052.jet@gyve.org> References: <20041019.173452.175857052.jet@gyve.org> X-Mailer: Mew version 4.0.62 on Emacs 21.3.50 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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: 2932 Lines: 78 To make people can inspect my PANIC easily, I have made .tar.gz file of the archive. (Categories other than gtracer are removed.) wget http://www.gyve.org/~jet/inspector.tar.gz I wrote: > When I tried to get my code from my archive, I got a PANIC. > > > [jet@localhost jet]$ tla get jet@gyve.org--inspector/gtracer--mainline--0.0 /tmp/examples > * from pristine cache: jet@gyve.org--inspector/gtracer--mainline--0.0--base-0 > * patching for revision: jet@gyve.org--inspector/gtracer--mainline--0.0--patch-1 > PANIC: conflict applying patch in arch_build_revision > [jet@localhost jet]$ tla --version > tla lord@emf.net--2004/dists--devo--1.0--patch-9(configs/emf.net-tla/devo.tla-1.2) from regexps.com > > Copyright 2003 Tom Lord > > This is free software; see the source for copying conditions. > There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A > PARTICULAR PURPOSE. > > Report bugs to lord@emf.net. > > # automatically generated release id (by tla build-config) > # > > lord@emf.net--2004/dists--devo--1.0--patch-9(configs/emf.net-tla/devo.tla-1.2) > > ./src lord@emf.net--2004/package-framework--devo--1.0--patch-3 > ./src/docs-hackerlab lord@emf.net--2004/docs-hackerlab--devo--1.0--base-0 > ./src/docs-tla lord@emf.net--2004/docs-tla--devo--1.0--patch-5 > ./src/hackerlab lord@emf.net--2004/hackerlab--devo--1.0--patch-37 > ./src/tla lord@emf.net--2004/tla--devo--1.2--patch-115 > > [jet@localhost jet]$ > > I used google to know more about this PANIC; and I found > http://lists.gnu.org/archive/html/gnu-arch-users/2004-02/msg00243.html > > > Ok, Aaron Bentley and I have verified that there was a missing corner > > case check in pristine tree verification. I'd wager you did something > > that resulted in partial deletion of the pristine tree, including the > > patch logs dir. This results in an incorrect add in the subsequent > > commit. > > > > The fixed code is in > > address@bogus.example.com/tla--integration--1.2--patch-8 > > > > And will be in tom's branch soon I hope. > > Here are my questions: > > 1. Is the patch(address@bogus.example.com/tla--integration--1.2--patch-8) > is merged to Tom's tree? > > 2. If the patch is merged to Tom's tree, how can I know the revision? > > 3. The bug fix is done for whether `tla commit' related code or > `tla get' related code? > If `tla commit' related code, even if I replaced tla installed to > my GNU system with newer one, the situation will change; the archive > is already broken. If `tla get' related code, I can continue to use > my archive. > > Regards, > Masatake YAMATO _______________________________________________ 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/