Matt Mackall <mpm@selenic.com> [Sun, 16 May 2010 14:38:32 -0500] rev 11186
Merge with stable
Steve Losh <steve@stevelosh.com> [Sat, 15 May 2010 23:33:22 -0400] rev 11185
tag: add -e/--edit option for modifying the commit message
Steve Borho <steve@borho.org> [Thu, 07 Jan 2010 22:19:05 -0600] rev 11184
extdiff: add labels, read diff arguments from [merge-tools]
hgtk has been using these same configs since Feb. Users only have to name the
tools they would like to use, ex:
[extdiff]
kdiff3 =
meld =
Yuya Nishihara <yuya@tcha.org> [Sun, 16 May 2010 22:23:14 +0900] rev 11183
patchbomb: respect HGPLAIN when piping --test output to PAGER
It makes easy to use `hg email --test` from another tool.
Brodie Rao <brodie@bitheap.org> [Mon, 03 May 2010 14:00:34 -0500] rev 11182
pager: fork and exec pager as parent process
With the pager as the child process instead of the parent process, the
termination of the parent Mercurial process can cause the terminal to return
before the pager exits. Inverting the relationship prevents that issue.
Platforms without fork() will continue to use util.popen().
Matt Mackall <mpm@selenic.com> [Sat, 15 May 2010 21:24:23 -0500] rev 11181
commit: fix complaint about branch merge creating new heads (issue2186)
Ori Avtalion <ori@avtalion.name> [Sat, 15 May 2010 00:34:07 +0300] rev 11180
Fix hg heads -r flag documentation
The command arguments are "[-ac] [-r STARTREV] [REV]..."
Ori Avtalion <ori@avtalion.name> [Fri, 14 May 2010 22:29:15 +0300] rev 11179
Fix wording in hg pull documentation
Gilles Moris <gilles.moris@free.fr> [Tue, 04 May 2010 09:57:16 +0200] rev 11178
merge: avoid to break the dirstate copy status on moved files
In the case a file is locally tracked as copied in dirstate, and that a merge
affects this file, this file should not be marked as modified in dirstate, as
this will break the current copy state.
Note: only affect working directory merge, not branch merge.
Matt Mackall <mpm@selenic.com> [Sat, 15 May 2010 17:48:49 -0500] rev 11177
commands: initial audit of exit codes
bisect: clarify None return
bundle: return 1 on no changes
clone: return result code
copy: limit errors to 0/1
commit: return 1 on no changes
forget: return 1 on errors
grep: return 1 if no match found
remove: return 1 on errors
resolve: return 1 if something fails to resolve
rollback: return 1 if no rollback data