Mercurial > hg > gitweb
view tests/test-archive.out @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 11 Dec 2006 18:09:52 +0100 |
parents | 9d1c3529ebbc |
children |
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 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