Brodie Rao <brodie@bitheap.org> [Thu, 23 Sep 2010 00:02:31 -0500] rev 12387
cleanup: use x in (a, b) instead of x == a or x == b
Martin Geisler <mg@aragost.com> [Thu, 23 Sep 2010 10:59:21 +0200] rev 12386
merge with stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 19:15:27 -0500] rev 12385
grep: only catch re.error when compiling regular expressions
Anthony Foiani <anthony.foiani@gmail.com> [Thu, 23 Sep 2010 00:27:04 -0600] rev 12384
doc: clarify smtp.password usage
Mads Kiilerich <mads@kiilerich.com> [Thu, 23 Sep 2010 01:59:02 +0200] rev 12383
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 23 Sep 2010 01:23:16 +0200] rev 12382
log: include unmodified-in-merge files in log diff/stat (issue2383)
f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.
This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...
Mads Kiilerich <mads@kiilerich.com> [Thu, 23 Sep 2010 01:51:17 +0200] rev 12381
tests: fix unzip -l variability fix
01-01-1980 slipped through the grep.
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 18:29:41 -0500] rev 12380
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 17:13:49 -0500] rev 12379
tests: fix unzip -l variability
Patrick Mezard <pmezard@gmail.com> [Wed, 22 Sep 2010 23:51:10 +0200] rev 12378
mq: always require --force when pushing patches (issue2363)
--force was not necessary when passing --rev since 55578a8d7e84, but this
behaviour is usually harmful when branch names are passed instead of explicit
revisions.