Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-purge.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sat, 27 Oct 2007 16:27:55 +0400 |
| 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