Mercurial > hg
view tests/test-pull.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 | 39e7f14a8286 |
| children |
line wrap: on
line source
adding foo checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions 0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo pulling from http://foo:***@localhost:$HGPORT/ searching for changes no changes found rolling back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) % issue 622 pulling from ../test requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % test file: uri handling abort: repository /test-doesnt-exist not found!