David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 00:10:43 +0100] rev 13628
tests: respect new hg clone listkey queries in http-proxy test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 14:36:47 +0100] rev 13627
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.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 16:13:25 +0100] rev 13626
fix test-highlight after bookmark support change for hgweb
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 10:09:30 -0500] rev 13625
merge with stable
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 10:03:06 -0500] rev 13624
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:59:50 +0100] rev 13623
merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 13 Mar 2011 15:59:24 +0100] rev 13622
tests: fix failures introduced in 7359cb753a54
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 11:06:40 +0100] rev 13621
tests: fix permission issue trying to remove test directory
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:42:24 +0100] rev 13620
bookmarks: fix update of the current bookmark during rename
We need to get rid of the previous bookmark after changing current bookmark.
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 08:50:06 -0500] rev 13619
setup: remove unnecessary code for win32com (pywin32)
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:10:01 +0100] rev 13618
test-highlight: fix test output (introduced by 2151703e7f84)
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13617
eol: rename hook into checkheadshook, add checkallhook (issue2665)
"hook" is still an alias for "checkheadshook".