[Monotone-devel] "Clobbered tid" problem

[Glen Ditchfield]

[~]$ monotone --full-version
monotone 0.23 (base revision: e32d161b8d5cde9f0968998cc332f82f82c27006)
Running on: Linux 2.6.8-24.19-default #1 Tue Nov 29 14:32:45 UTC 2005 i686
Changes since base revision:
new_manifest [68895899b164e1f443f988efef93e8384f1b182a]

old_revision [e32d161b8d5cde9f0968998cc332f82f82c27006]
old_manifest [68895899b164e1f443f988efef93e8384f1b182a]


[~]$ monotone merge
monotone: starting with revision 1 / 2
monotone: merging with revision 2 / 2
monotone: [source] 3a3dd0540afc3a507b5acea15f4dc687fa9374ce
monotone: [source] 760e00ecf3bd6564f9407206341c4cf52316041f
monotone: common ancestor 0e5dd75332081b17988149d9dd9b836722754aa9 gjditchf 
2005-11-08T04:41:26 found
monotone: trying 3-way merge
monotone: misuse: tid 6161 (Mail/.filed.directory/Receipts) clobbered tid 5823 
(Mail/.filed.directory/Receipts)

===================
I think what happened here is that I converted Receipts from an mbox file to a 
maildir directory, and did what seemed like the sensible set of monotone 
drops and adds.  Since I was only using one computer at the time, it never 
occurred to me that the branch might have more than one head -- monotone list 
missing and list unknown had no complaints, so I was happy.

The monotone --debug output is 81855 lines, so I won't bother attaching it.

Suggestions?

By the way, about the error message: is this really a "misuse" situation, not 
an internal error?