[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: conflict applying patch in arch_build_revision
From: |
Matthieu Moy |
Subject: |
[Gnu-arch-users] Re: conflict applying patch in arch_build_revision |
Date: |
Tue, 09 Nov 2004 11:11:24 +0100 |
User-agent: |
Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux) |
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 :-(
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