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
Mads Kiilerich <mads@kiilerich.com> [Fri, 25 Jun 2010 19:59:22 +0200] rev 11447
mercurial.spec: don't include convert-repo - use "hg convert" instead
Julian Cowley <julian@lava.net> [Fri, 25 Jun 2010 01:27:25 -1000] rev 11446
revset: remove debugging leftover
Gilles Moris <gilles.moris@free.fr> [Sat, 26 Jun 2010 15:56:48 +0200] rev 11445
contrib: update tcsh_completion with commands for 1.6
Added the following commands: debugbuilddag debugdag debugpushkey
debugrevspec.
Matt Mackall <mpm@selenic.com> [Sat, 26 Jun 2010 12:26:03 -0500] rev 11444
bookmarks: fix in/out return values
Matt Mackall <mpm@selenic.com> [Sat, 26 Jun 2010 12:24:55 -0500] rev 11443
bookmarks: fix bogus cut and paste for outgoing
Matt Mackall <mpm@selenic.com> [Fri, 25 Jun 2010 13:47:28 -0500] rev 11442
addchangegroup: pass in lock to release it before changegroup hook is called
Currently, callers of addchangegroup first acquire the repository
lock, usually to check that an unbundle request isn't racing. This
means that changegroup hook actions that might write to a repo get
stuck waiting for a lock. Here, we add a new optional lock parameter
and update all the callers. Post-1.6 we may make it non-optional.