Re: I can't commit a simple change

[Stephen J. Turnbull]

Lars Ingebrigtsen writes:

 > > The right incantation is "rm `bzr ls --unknown`; bzr revert" before
 > > merging.  But if that actually makes any changes to your tree, it's
 > > destroying data that *you* put there[1].  Neither Bazaar nor Make
 > > should do that automatically.
 > 
 > I've put no data in the info directory, and neither has Richard.

In that case, this is a one-off problem and removing and ignoring the
info directory entirely was the right fix.