Date: Tue, 19 Oct 2004 17:34:52 +0900 (JST)
Message-Id: <20041019.173452.175857052.jet@gyve.org>
To: gnu-arch-users@gnu.org
From: Masatake YAMATO <jet@gyve.org>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Subject: [Gnu-arch-users] conflict applying patch in arch_build_revision
Precedence: list
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: 2616
Lines: 71
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/