[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] PANIC: conflict applying patch in arch_build_revisi
From: |
Brian May |
Subject: |
Re: [Gnu-arch-users] PANIC: conflict applying patch in arch_build_revision |
Date: |
Wed, 04 Feb 2004 08:44:58 +1100 |
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux) |
>>>>> "Jacob" == Jacob Gorm Hansen <address@hidden> writes:
Jacob> I get this output from
Jacob> $ tla apply-changeset patch base
Jacob> A
{arch}/xen/xen--migration/xen--migration--1.2/address@hidden/patch-log/patch-1
Jacob> A
{arch}/xen/xen--unstable/xen--unstable--1.2/address@hidden/patch-log/patch-2
Jacob> CA xenolinux-sparse
Jacob> C
{arch}/xen/xen--unstable/xen--unstable--1.2/address@hidden/patch-log/base-0
Jacob> C
{arch}/xen/xen--unstable/xen--unstable--1.2/address@hidden/patch-log/patch-1
Jacob> So I suppose this conflict is the problem, though I have no
Jacob> idea how I managed to create that.
Just a random guess, was your pristine/revision tree corrupt when did
the commit?
My testing has shown if you delete a file from the pristine tree, it
is not detected during commit operations, and tla marks the file in
the changeset as an "added" file.
Perhaps this could be your problem? I think you could find out more by
analysing why those files generate conflicts. eg. look at the *.rej
files.
You might be able to recover by hacking the archive to delete patch-1;
however, there are certain issues to watch out for (eg. this
'++revision-lock' directory I see in my archives) which I haven't
tried to understand (yet), so someone else might be able to help
better.
--
Brian May <address@hidden>
Re: [Gnu-arch-users] PANIC: conflict applying patch in arch_build_revision, Robert Collins, 2004/02/03
Re: [Gnu-arch-users] PANIC: conflict applying patch in arch_build_revision, Robert Collins, 2004/02/07