Azhagu Selvan SP <tamizhgeek@gmail.com> [Wed, 20 Oct 2010 18:15:47 +0530] rev 12796
mercurial.el: fix hg-outgoing path when 'default-push' is not defined
hg-outgoing path is set as 'default-push' which prevents it from working in
repos which only have 'default' defined.
Fix provided by Kyujin Shim at
http://alexott.net/en/writings/emacs-vcs/EmacsMercurial.html
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 17:06:42 -0500] rev 12795
merge default into stable for 1.7 freeze
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Oct 2010 23:48:33 +0200] rev 12794
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Oct 2010 23:39:48 +0200] rev 12793
patchbomb: hide passwords potentially embedded in urls
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:45:08 -0500] rev 12792
wix: add vim syntax file for Mercurial unit tests
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:41:17 -0500] rev 12791
wix: add new help page templates
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:27:24 -0500] rev 12790
wix: add new merge-tools.txt help text
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 15:36:42 -0500] rev 12789
Merge with mpm
Steve Borho <steve@borho.org> [Tue, 19 Oct 2010 22:33:52 -0500] rev 12788
merge: implement --tool arguments using new ui.forcemerge configurable
ui.forcemerge is set before calling into merge or resolve commands, then unset
to prevent ui pollution for further operations.
ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the
given --tool is not found by the merge-tools machinery. This makes it possible
to do: hg resolve --tool="python mymerge.py" FILE
With this approach, HGMERGE and ui.merge are not harmed by --tool
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 15:09:38 -0500] rev 12787
tests: fix up changed output