view tests/test-purge.out @ 5192:33015dac5df5

convert: fix mercurial_sink.putcommit Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a revision that touches no files, but this can break regular conversions from some repositories: - conceptually, since we're converting a repo, we should try to make the new hg repo as similar as possible to the original repo - we should create a new changeset, even if the original revision didn't touch any files (maybe the commit message had some important bit); - even if a "regular" revision that doesn't touch any file may seem weird (and maybe even broken), it's completely legitimate for a merge revision to not touch any file, and, if we just skip it, the converted repo will end up with wrong history and possibly an extra head. As an example, say the crew and main hg repos are sync'ed. Somebody sends an important patch to the mailing list. Matt quickly applies and pushes it. But at the same time somebody also applies it to crew and pushes it. Suppose the commit message ended up being a bit different (say, there was a typo and somebody didn't fix it) or that the date ended up being different (because of different patch-applying scripts): the changeset hashes will be different, but the manifests will be the same. Since both changesets were pushed to public repos, it's hard to recall them. If both are merged, the manifest from the resulting merge revision will have the exact same contents as its parents - i.e. the merge revision really doesn't touch any file at all. To keep the file filtering stuff "working", the generic code was changed to skip empty revisions if we're filtering the repo, fixing a bug in the process (we want parents[0] instead of tip).
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 17 Aug 2007 20:18:05 -0300
parents ca4971347e0a
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
Removing file untracked_file
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
refused to run
untracked_file still around
untracked_file
refused to run
untracked_file still around
Removing file untracked_file
directory
r1
% 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