Thu, 23 Sep 2010 01:59:02 +0200 merge with stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 23 Sep 2010 01:59:02 +0200] rev 12383
merge with stable
Thu, 23 Sep 2010 01:23:16 +0200 log: include unmodified-in-merge files in log diff/stat (issue2383) 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 ...
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip