[Gnu-arch-users] tla 1.2 PANIC

[David Snopek]

Ok guys, I really need some help.  I spent a big chunk of time hacking on
one of my projects.  Then I went to one of my other development machines
and tried to update/replay/get and I end up with a PANIC on patch-5. 
Unfortunately, this isn't even the last patch, I think its up to patch-7. 
As far as I know, in patch-5, I added a directory with about 4 files, 2
files in another directory, and moved 2 files.  I don't think I even
edited any pre-existing files.  I need advice on how to fix my tree!  I
would really like to mantain the current revision history somehow (ie.
without trashisg it and start over).

serv:/home/xevol/prj# tla get
address@hidden/xmldoom--mainline--0.0 xmldoom
* from import revision:
address@hidden/xmldoom--mainline--0.0--base-0
* patching for revision:
address@hidden/xmldoom--mainline--0.0--patch-1
* patching for revision:
address@hidden/xmldoom--mainline--0.0--patch-2
* patching for revision:
address@hidden/xmldoom--mainline--0.0--patch-3
* patching for revision:
address@hidden/xmldoom--mainline--0.0--patch-4
* patching for revision:
address@hidden/xmldoom--mainline--0.0--patch-5
PANIC: conflict applying patch in arch_build_revision

Thank you.
  -- David Snopek

Satellite Computing Solutions, LLC