[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] conflict applying patch in arch_build_revision
From: |
Masatake YAMATO |
Subject: |
Re: [Gnu-arch-users] conflict applying patch in arch_build_revision |
Date: |
Tue, 09 Nov 2004 17:32:35 +0900 (JST) |
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.
>
>
> address@hidden jet]$ tla get address@hidden/gtracer--mainline--0.0
> /tmp/examples
> * from pristine cache: address@hidden/gtracer--mainline--0.0--base-0
> * patching for revision: address@hidden/gtracer--mainline--0.0--patch-1
> PANIC: conflict applying patch in arch_build_revision
> address@hidden jet]$ tla --version
> tla
> address@hidden/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 address@hidden
>
> # automatically generated release id (by tla build-config)
> #
>
> address@hidden/dists--devo--1.0--patch-9(configs/emf.net-tla/devo.tla-1.2)
>
> ./src address@hidden/package-framework--devo--1.0--patch-3
> ./src/docs-hackerlab address@hidden/docs-hackerlab--devo--1.0--base-0
> ./src/docs-tla address@hidden/docs-tla--devo--1.0--patch-5
> ./src/hackerlab address@hidden/hackerlab--devo--1.0--patch-37
> ./src/tla address@hidden/tla--devo--1.2--patch-115
>
> address@hidden 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@hidden/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@hidden/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
- Re: [Gnu-arch-users] conflict applying patch in arch_build_revision,
Masatake YAMATO <=