Re: [Monotone-devel] Re: tid 539 clobbered tid 482

[Nathaniel Smith]

On Mon, Jun 20, 2005 at 12:12:26PM +0200, Peter Simons wrote:
> I'd love to just let this go, but I can't.
> 
>  >> monotone: trying 3-way merge
>  >> monotone: misuse: tid 539 (blast) clobbered tid 482 (blast)
>  >
>  > 
> http://www.loglibrary.com/show_page/view/106?Multiplier=3600&Interval=6&StartTime=1117952588
> 
> Is there ANY way to fix this problem? Or is there ANY way to
> fix the database so that the problem doesn't occur any more?
> Is there ANY way I can help to get this problem fixed?

Okay, graydon and I looked at this problem again today.  Sorry for
taking so long.  As far as we can tell without looking at your
database, you seem to have managed to put two distinct files, that
existed in the same revision, on top of each other, and then try to
merge that with yet another version.  I'm not quite sure how you
accomplished this; I know some ways to get such an effect (and they're
part of what make our current file identity tracking broken), but
they're really quite tricky... I'm very curious :-).

Anyway, if that analysis is correct, your tree really is in a strange
state, and it just didn't get noticed until now.  This makes
workarounds a bit tricky.  One option is to just comment out the call
to ensure_no_rename_clobbers in change_set.cc; I doubt doing so will
break things any worse than they already are.  Another option is to
somehow work around that check; the check is very particular (and thus
a bad check, really, there are plenty of similar cases that don't
cause problems).  For instance, you could rename the file/directory
that's causing the problem away on one side, do the merge, and then
fix things up by hand.

Hopefully the changeset rewrite in the works will clean up all of this
mess.

-- Nathaniel

-- 
So let us espouse a less contested notion of truth and falsehood, even
if it is philosophically debatable (if we listen to philosophers, we
must debate everything, and there would be no end to the discussion).
  -- Serendipities, Umberto Eco