view tests/test-archive.out @ 2175:b2ae81a7df29

Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 02 May 2006 18:44:02 +0200
parents 98cc126f9f3f
children 4e35843b2683
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.