Re: [Gnu-arch-users] PANIC: conflict applying patch in arch_build_revision

[Robert Collins]

On Wed, 2004-02-04 at 09:21, Robert Collins wrote:
> On Tue, 2004-02-03 at 06:19, Jacob Gorm Hansen wrote:
> > hi,
> > 
> > I just installed tla-1.2pre2, and when trying to get an archive created
> > with 1.2pre0 I am getting (apart from a lot of warnings about lacking
> > checksums) the error:
> > 
> > PANIC: conflict applying patch in arch_build_revision
> > 

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.

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.

signature.asc
Description: This is a digitally signed message part