Greg Ward <greg-hg@gerg.ca> [Mon, 15 Feb 2010 15:25:29 -0500] rev 10505
merge: fix --preview to show all nodes that will be merged (issue2043).
Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge. The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().
Greg Ward <greg-hg@gerg.ca> [Mon, 15 Feb 2010 15:07:21 -0500] rev 10504
test-merge-default: make content of test repo clearer.
Makes it easier to understand and modify the test.
(issue2043).
Adrian Buehlmann <adrian@cadifra.com> [Thu, 18 Feb 2010 20:47:12 +0100] rev 10503
contrib/wix: MSVC CRT libraries are installed in WinSxS
not in %system32%
Steve Borho <steve@borho.org> [Thu, 18 Feb 2010 13:05:15 -0600] rev 10502
Add WiX installer scripts to contrib/wix
Brendan Cully <brendan@kublai.com> [Thu, 18 Feb 2010 10:46:01 -0800] rev 10501
import: if in doubt, consume stream until start of diff
This prevents a header-like line in the message body from causing a spurious split.
Alistair Bell <alistair@bellsonline.com> [Thu, 18 Feb 2010 10:32:51 +0100] rev 10500
bdiff: do not use recursion / avoid stackoverflow (issue1940)
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Feb 2010 05:55:05 +0100] rev 10499
keyword: mark improved demo commit message for translation
s/config/configuration/
Inside the quoted command put the message in single quotes in case
the translation contains apostrophes.
Brendan Cully <brendan@kublai.com> [Wed, 17 Feb 2010 14:35:11 -0800] rev 10498
mq: iterate over a copy of the command table keys (fixes issue2045).
I hope.
Martin Geisler <mg@lazybytes.net> [Wed, 17 Feb 2010 23:10:22 +0100] rev 10497
Merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 17 Feb 2010 23:07:50 +0100] rev 10496
progress: mark strings for translation
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 17:11:20 +0100] rev 10495
keyword: do not postpone commit hooks
With 0e64d814d7d0 in place, this hack is not needed any more.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Feb 2010 20:44:49 +0100] rev 10494
inotify/inserve: implement --timeout-idle option (issue885)
hg inserve was ignoring and miscomputing the --timeout-idle option (seconds
vs. minutes).
Thanks to Jesse Glick for the bugreport and the initial patch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Feb 2010 20:30:57 +0100] rev 10493
regression: missing arg from 24ce8f0c0a39 dirstate.{walk,status} changes
Sune Foldager <cryo@cyanite.org> [Wed, 17 Feb 2010 15:43:21 +0100] rev 10492
run commit and update hooks after command completion (issue1827)
Previously, the working dir state hadn't been written when these
hooks were invoked, so external commands couldn't see all changes.