Re: [Gnu-arch-users] tla 1.2 PANIC

[David Snopek]

David Snopek said:
> 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).

Ok, now I have been muddling around in the patch-5 changeset.  When doing
a get for patch-4 and doing a "tla update" it actually tells me what the
conflicts are.  It seems to be confused about the 2 files that I moved:

replay: conflicts occured during replay
* reapplying local changes
* linting the source tree
Duplicated ids among each group of files listed here:

src/schemas/.arch-ids/string.rng.id
E_David_Snopek_<address@hidden>_Thu_Mar__4_11:55:49_2004_18277.0
src/schemas/.arch-ids/string.rng.ould.id

src/schemas/.arch-ids/xmldoom-definition.rng.id
E_David_Snopek_<address@hidden>_Thu_Mar__4_11:55:49_2004_29217.0
src/schemas/.arch-ids/xmldoom-definition.rng.ould.id

src/schemas/string.rng
x_David_Snopek_<address@hidden>_Thu_Mar__4_11:55:49_2004_18277.0
src/schemas/string.rng.ould

src/schemas/xmldoom-definition.rng
x_David_Snopek_<address@hidden>_Thu_Mar__4_11:55:49_2004_29217.0
src/schemas/xmldoom-definition.rng.ould

I moved them using "tla mv" which is why the id's are the same.  But why
didn't the changeset record this as a move?  What would I have to change
in the .patches.tar.gz file to make it into a move?  I have had to make
tiny changes to the changeset already and I am not afraid to
unpack/repack/md5sum.

Thank you.
  -- David Snopek

Satellite Computing Solutions, LLC