[Gnu-arch-users] Conflict applying patch

[Nolan Eakins]

I'm running into "PANIC: conflict applying patch in arch_build_revision"
when I try to get a copy of one of my archives. I don't know why. I read
[1], but I don't know if it even applies to my archive or not. The fix
isn't very descriptive because I don't know if it means to add a '\n' or "\
No newline at end of file". The rest of the thread then goes on to describe
how arch's test suite will detect it and such.

My archive is accessible at [2]. I'm running tla-1.2-4 on a Gentoo system
with diff 2.8.4. Arch doesn't panic until patch-5.

[1] http://lists.gnu.org/archive/html/gnu-arch-users/2003-12/msg00390.html
[2] http://semanticgap.com/arch/psi-sneakin/

Thanks,
Nolan

-- 
http://www.semanticgap.com/people/sneakin/