Mercurial > hg
view tests/test-purge.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 | b777dd8f7836 |
| children |
line wrap: on
line source
% init % setup % delete an empty directory empty_dir Removing directory empty_dir directory r1 % delete an untracked directory untracked_dir/untracked_file1 untracked_dir/untracked_file2 Removing file untracked_dir/untracked_file1 Removing file untracked_dir/untracked_file2 Removing directory untracked_dir directory r1 % delete an untracked file untracked_file untracked_file_readonly Removing file untracked_file Removing file untracked_file_readonly directory r1 % delete an untracked file in a tracked directory directory/untracked_file Removing file directory/untracked_file directory r1 % delete nested directories untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 % delete nested directories from a subdir untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 % delete only part of the tree untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 directory/untracked_file % skip ignored files if --all not specified directory ignored r1 ignored Removing file ignored directory r1 % abort with missing files until we support name mangling filesystems untracked_file ! r1 ? untracked_file untracked_file Removing file untracked_file ! r1 % tracked file in ignored directory (issue621) untracked_file Removing file untracked_file % skip excluded files directory excluded_file r1 % skip files in excluded dirs directory excluded_dir r1 file % skip excluded empty dirs directory excluded_dir r1 % skip patterns