Comment 20 for bug 632704

@Ray: Yes, it's an obscure bug and I suspect there are others when you try to merge into a working tree with pending changes. On the bright side, we only encounter them in pretty obscure cases too :)

So my recommendation will be to avoid it by either reverting/shelving or committing before doing an update.

I'm still a bit surprised that we got different 'new-nnn' numbers for the same operation and that you weren't able to use shelve.

Otherwise, the bug is not related to the repo format used. so stay with 2a anyway.

Oh, and, 2.2.1 has been released too ;)