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.
Julian Cowley <julian@lava.net> [Wed, 23 Jun 2010 16:54:12 -1000] rev 11450
revset: fix spelling typo
Julian Cowley <julian@lava.net> [Fri, 11 Jun 2010 01:35:38 -1000] rev 11449
parser: fix URL to effbot
Eric Eisner <ede@mit.edu> [Thu, 24 Jun 2010 21:35:52 -0700] rev 11448
glog: fix crash on empty revision range