Monotone issues

[Richard Purdie <rpurdie@rpsys.net>]

Just so everyone is aware, it became apparent that a newer version of
strace in OE.dev had disappeared. This was traced back to something from
tmbinc which shouldn't have been merged but accidentally was.

A disapprove wouldn't work since the automerger had merged it. I asked
the monotone devs for advice on irc and was told I should be able to
suspend that revision and work from and older one.

I ran:

mtn suspend 50d03f17a42a3854cd87f47ef75084da297d194e

and then 

mtn up -r e651c4fa9a5d1fc6120cc2309e9cba1388cecc52

and then committed something to form a new head revision.

This appeared to work for me locally, I pushed it, pulled on another
machine and all seemed well, it would only affect anyone who'd actually
checked out the bad revision (50d03f17a42a3854cd87f47ef75084da297d194e)
who would then need to run 
mtn up -r11d1a9e6662c57de089d25a6900d5325f85d282e
and we ran the risk of someone merging this again but it could be worse.

monotone 0.37 wouldn't show the other head but I suspect older monotones
do and don't support the suspend certificate. I suspect the automerger
runs on a machine with an older monotone since it then merged the
problematic head back and put us back to square one.

So I've applied a reverse diff to restore the broken files and damaged
the history :(. I was thinking it was a larger scale problem than it is,
only about 12 files were affected. Its amazingly hard to work this out
though.

The difficulty in fixing this simple problem along with the speed issues
make me wonder if monotone is right for the future though? I do get put
off making commits due to the lack of speed too...

Richard