Mercurial > hg
view tests/test-issue842.out @ 12382:28ddf67198b2 stable
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 ...
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 23 Sep 2010 01:23:16 +0200 |
parents | 4b0c9c674707 |
children |
line wrap: on
line source
adding a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % should issue warning adding a created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % should not issue warning 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch testing % should not issue warning