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 iA9ADLRc014196 for ; Tue, 9 Nov 2004 10:13:21 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf5.us4.outblaze.com (Postfix) with ESMTP id 4098877379 for ; Tue, 9 Nov 2004 10:13:20 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRT8S-0000Lo-PK for migo@homemail.com; Tue, 09 Nov 2004 05:22:00 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CRT6n-00009i-LD for gnu-arch-users@gnu.org; Tue, 09 Nov 2004 05:20:17 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CRT6m-00009A-GK for gnu-arch-users@gnu.org; Tue, 09 Nov 2004 05:20:16 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRT6l-000090-VO for gnu-arch-users@gnu.org; Tue, 09 Nov 2004 05:20:16 -0500 Received: from [129.88.30.1] (helo=imag.imag.fr) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1CRSyH-0006bK-Nr for gnu-arch-users@gnu.org; Tue, 09 Nov 2004 05:11:30 -0500 Received: from ecrins.imag.fr (ecrins.imag.fr [129.88.43.124]) by imag.imag.fr (8.13.0/8.13.0) with ESMTP id iA9ABOKn009876; Tue, 9 Nov 2004 11:11:24 +0100 (CET) Received: from moy by ecrins.imag.fr with local (Exim 3.35 #1) id 1CRSyC-0006zu-00; Tue, 09 Nov 2004 11:11:24 +0100 To: Masatake YAMATO References: <20041019.173452.175857052.jet@gyve.org> <20041109.173235.212066485.jet@gyve.org> From: Matthieu Moy Mail-Followup-To: Masatake YAMATO , gnu-arch-users@gnu.org Date: Tue, 09 Nov 2004 11:11:24 +0100 In-Reply-To: <20041109.173235.212066485.jet@gyve.org> (Masatake YAMATO's message of "Tue, 09 Nov 2004 17:32:35 +0900 (JST)") Message-ID: User-Agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.4 (imag.imag.fr [129.88.30.1]); Tue, 09 Nov 2004 11:11:24 +0100 (CET) X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-Information: Please contact the ISP for more information Cc: gnu-arch-users@gnu.org Subject: [Gnu-arch-users] Re: conflict applying patch in arch_build_revision 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: 1426 Lines: 41 Masatake YAMATO writes: >> [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 Seems your archive is corrupted :-( Normally, the changeset patch-N+1 should apply exactly to the revision patch-N, because it was uploaded by "tla commit", which computed the changeset based on patch-N (which was in a pristine tree or in your revlib at that moment). If you had a corrupt revlib or library when you comitted (this happened to a friend once because we had changed history : Lost a few changesets after an unfortunate "rm -rf ~" -- don't laugh -- and rebuilt the changesets without unregistering the revlib), then, this is no longer the case, and the inexact patching may result in conflicts, and thus, PANIC. Solutions : * Manually edit the changesets and upload the modified version to your archive (VERY dangerous), * Start a new branch and never use this one again, * Is there something better? -- Matthieu _______________________________________________ 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/