Mads Kiilerich <mads@kiilerich.com> [Mon, 28 Jun 2010 23:16:11 +0200] rev 11460
test-alias: don't use the environment variable PWD
solaris ...
Mads Kiilerich <mads@kiilerich.com> [Mon, 28 Jun 2010 15:08:01 +0200] rev 11459
revert: Make it clearer when not to use revert
Augie Fackler <durin42@gmail.com> [Sun, 27 Jun 2010 22:20:47 -0500] rev 11458
progress: check stderr.isatty() before each print
This prevents writing progress information to a non-tty stderr if one is
swapped in after startup, which happens in `hg serve`.
Mads Kiilerich <mads@kiilerich.com> [Sat, 26 Jun 2010 23:00:58 +0200] rev 11457
http digest auth: reset redirect counter on new requests (issue2255)
This fixes a regression introduced in a1e575b48563 when Mercurial reuses the
auth handler for several requests and the redirect counter never is reset.
Matt Mackall <mpm@selenic.com> [Mon, 28 Jun 2010 11:07:27 -0500] rev 11456
revset: deal with empty sets in range endpoints
(spotted by Julian Cowley <julian@lava.net>)
Matt Mackall <mpm@selenic.com> [Sun, 27 Jun 2010 18:20:49 -0500] rev 11455
subrepo: fix silent push failure for SVN (issue2241)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 18 Jun 2010 08:49:24 +0200] rev 11454
merge: pass constant cset ancestor to fctx.ancestor
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 18 Jun 2010 08:48:05 +0200] rev 11453
context: allow passing the common cset ancestor to fctx.ancestor
This is used by the next patch to speed up merge.applyupdates.
Matt Mackall <mpm@selenic.com> [Sun, 27 Jun 2010 17:41:43 -0500] rev 11452
merge: document how to 'undo' a merge
Martin Geisler <mg@lazybytes.net> [Sun, 27 Jun 2010 23:12:05 +0200] rev 11451
resolve: do not crash on empty mergestate
I managed to get an empty .hg/merge/state file by interrupting a merge
by pressing Control-C. This lead to this error:
TypeError: a2b_hex() argument 1 must be string or read-only buffer,
not None
since localnode is assigned None before the iteration over lines in
the mergestate begins.