[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: conflict applying patch in arch_build_revision
From: |
Masatake YAMATO |
Subject: |
Re: [Gnu-arch-users] Re: conflict applying patch in arch_build_revision |
Date: |
Wed, 10 Nov 2004 15:38:49 +0900 (JST) |
Thank you for suggestions.
> On Tue, Nov 09, 2004 at 11:11:24 +0100, Matthieu Moy wrote:
> > Masatake YAMATO <address@hidden> writes:
> >
> > >> 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
> >
> > Seems your archive is corrupted :-(
>
> It does not have to be the archive. It might be the "pristine cache",
> that is pristine tree in your working copy. Try to remove each and every
> {arch}/++pristine-trees directory you can find. In fact, those in
> /tmp/* should suffice.
Like this?
address@hidden tmp]$ tla get address@hidden/gtracer--mainline--0.0--base-0
/tmp/examples
* from import revision: address@hidden/gtracer--mainline--0.0--base-0
* making pristine copy
* tree version set address@hidden/gtracer--mainline--0.0
address@hidden tmp]$ cd examples/
address@hidden examples]$ find . | grep '\{arch\}/++pristine-trees$'
./{arch}/++pristine-trees
address@hidden examples]$ rm -rf ./{arch}/++pristine-trees
address@hidden examples]$ tla update
* setting aside local changes temporarily
* linting the source tree
* build pristine tree for address@hidden/gtracer--mainline--0.0--base-0
* from import revision: address@hidden/gtracer--mainline--0.0--base-0
* reverting changes
* updating for new patches in archive
* finding or making gtracer--mainline--0.0--base-0
* build reference tree for address@hidden/gtracer--mainline--0.0--base-0
* from import revision: address@hidden/gtracer--mainline--0.0--base-0
* finding or making gtracer--mainline--0.0--patch-40
* build reference tree for address@hidden/gtracer--mainline--0.0--patch-40
* from import revision: 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 examples]$
> By the way, is the machine running tmpreaper? That would explain
> corruption of pristines under tmp.
/tmp is used to explain my trouble.
Even if I run `tla get' in my home directory, the situation is
not changed.
After updating which was failed as I write above, I tried to run tla replay.
It seems that =tagging-method causes the trouble.
address@hidden examples]$ tla replay
* patching for revision address@hidden/gtracer--mainline--0.0--patch-1
A/ misc
A/ misc/.arch-ids
A/ src
A/ src/.arch-ids
A/ src/module
A/ src/module/.arch-ids
A/ src/preload
A/ src/preload/.arch-ids
A Makefile.am
A autogen.sh
A configure.in
A misc/.arch-ids/=id
A misc/Makefile.am
A run-test.sh.in
A src/.arch-ids/=id
A src/Makefile.am
A src/gtracer.h
A src/module/.arch-ids/=id
A src/module/Makefile.am
A src/module/extensions.c
A src/module/log.c
A src/module/main.c
A src/module/module.h
A src/module/nil_log.c
A src/module/pmaps_log.c
A src/module/queue.c
A src/module/signal_log.c
A src/module/viewer.c
A src/preload/.arch-ids/=id
A src/preload/Makefile.am
A src/preload/gmodule_wrapper.c
A src/preload/init.c
A src/preload/preload.h
A src/preload/signal_wrapper.c
A src/test.c
A {arch}/.arch-project-tree
CA {arch}/=tagging-method
A
{arch}/gtracer/gtracer--mainline/gtracer--mainline--0.0/address@hidden/patch-log/base-0
A
{arch}/gtracer/gtracer--mainline/gtracer--mainline--0.0/address@hidden/patch-log/patch-1
replay: conflicts occured during replay
address@hidden examples]$