Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:11:37 +0900] rev 9514
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:30:24 +0900] rev 9513
cmdutil: service: add an optional runargs argument to pass the command to run
This would be necessary for inotify launching its server: the initial command
is a standard 'hg st'/'hg ci'/... but the daemon to run is 'hg inserve'
Sune Foldager <cryo@cyanite.org> [Thu, 17 Sep 2009 21:12:32 +0200] rev 9512
extdiff: add 3-way diff for merge changesets
This adds 3-way diff for merge changesets (using -c) and for diffing
the working directory context against two parents. To enable it, use
the new magic value '$parent2' in the argument line. In order to work,
your differ must support that the second parent argument is left out;
this will happen in 2-way mode. Default arguments are as before, without
enabling 3-way mode, ensuring backwards compatibility.
This also fixes a problem when diffing a merge changeset with a single
file change. Extdiff would sometimes do the wrong thing in that situation.
Kevin Bullock <kbullock@ringworld.org> [Wed, 23 Sep 2009 21:29:47 -0500] rev 9511
bash_completion: add completions for shelve extension
Adrian Buehlmann <adrian@cadifra.com> [Thu, 01 Oct 2009 11:40:53 +0200] rev 9510
doc: clarify license footers
Mercurial is licensed under version 2 of the GPL
Adrian Buehlmann <adrian@cadifra.com> [Thu, 01 Oct 2009 17:17:52 +0200] rev 9509
dirstate: kill dirstate.granularity config option
The dirstate.granularity configuration parameter was never documented,
it only adds code complexity and it is unneeded.
Adding comments describing forced 'unset' entries.
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 21:42:51 -0500] rev 9508
Merge with -stable