bookmarks: discard current bookmark if absent from the bookmarks (
issue2692)
After a rollback, the current bookmark might be absent from the bookmarks
file. In that case we discard it instead of displaying a traceback during
commit.
eol: do not abort when win32text is found, only warn
The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled. It's just folly. So spewing warnings in
this condition is preferrable to aborting. When both extensions are enabled,
the user now sees:
% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py
tests: fix failures introduced in
7359cb753a54
bookmarks: fix update of the current bookmark during rename
We need to get rid of the previous bookmark after changing current bookmark.
test-highlight: fix test output (introduced by
2151703e7f84)