Binary equal files show as modified, unable to revert

Question

I suddenly have a few files that show as modified, but KDiff says they are binary equal. Reverting and discarding those changes does nothing.

Somehow, the eol extension is enabled and when I try to disable it, I can't view that one repo's Working Directory in TortoiseHg. An error appears:

[Error 6] The handle is invalid

When using the command line hg status, this error appears:

'cleverencode:' is not recognized as an internal or external command, operable program or batch file.

When using hg revert myfile, .orig files are generated but the files still appear as modified and the same error from above appears.

When updating to a previous commit, a whole lot of other files get in the same situation like those few I have now.

If necessary, I can throw away this clone and make a new clone, but it would be nice if this can be resolved without doing so.

Answer 1

Was able to solve it.

My global mercurial.ini had some lines with cleverencode in them. After removing those, the issue has disappeared. Enabling/disabling the eol extension also doesn't seem to cause any issues any more.

I suspect the troublemaker was Atlassian's SourceTree, I had installed an update yesterday and it asked if automatic line ending handling should be enabled. I'm quite sure I unchecked it, regardless, it seems to have mixed eol config with win32text config.

See also: [SRCTREEWIN-708] Possible error with Mercurial line ending handling configuration - Atlassian JIRA