Re: [Monotone-devel] "Clobbered tid" problem

[Nathaniel Smith]

On Sun, Jan 08, 2006 at 10:12:41AM -0600, Glen Ditchfield wrote:
> [~]$ 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_ this check is just completely bogus; I would be strongly
tempted to work around it by just commenting out the check entirely
and recompiling monotone.  It's in change_set.cc, function
ensure_no_rename_clobbers -- AFAICT the "error case" it is checking
for is not an error case at all, and it should simply be removed, but
I asked around and no-one seemed really confident about whether that
code was safe to touch or not, so nothing happened.

It's hard to suggest other possible workarounds without more details,
like the actual changesets being merged, etc.

The longer term solution is that all this code is all disappearing
very soon. 0.26pre1 release will probably have other bugs, but it
won't have this one :-).

-- Nathaniel

-- 
"But in Middle-earth, the distinct accusative case disappeared from
the speech of the Noldor (such things happen when you are busy
fighting Orcs, Balrogs, and Dragons)."