Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-archive.out @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a49f2a4d5ff7
children 0f594cc36aed
line wrap: on
line source

adding foo
adding bar
adding baz/bletch
test-archive-TIP/.hg_archival.txt
test-archive-TIP/bar
test-archive-TIP/baz/bletch
test-archive-TIP/foo
test-archive-TIP/.hg_archival.txt
test-archive-TIP/bar
test-archive-TIP/baz/bletch
test-archive-TIP/foo
Archive:  archive.zip
    testing: test-archive-TIP/.hg_archival.txt   OK
    testing: test-archive-TIP/bar   OK
    testing: test-archive-TIP/baz/bletch   OK
    testing: test-archive-TIP/foo   OK
No errors detected in compressed data of archive.zip.
test/.hg_archival.txt
test/bar
test/baz/bletch
test/foo
test/.hg_archival.txt
test/bar
test/foo
test-TIP/.hg_archival.txt
test-TIP/bar
test-TIP/baz/bletch
test-TIP/foo
True
abort: archive prefix contains illegal components
Archive:  test.zip
    testing: test/.hg_archival.txt    OK
    testing: test/bar                 OK
    testing: test/baz/bletch          OK
    testing: test/foo                 OK
No errors detected in compressed data of test.zip.
test-TIP/.hg_archival.txt
test-TIP/bar
test-TIP/baz/bletch
test-TIP/foo
rev-0.tar created
% empty repo
abort: repository has no revisions