Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-archive.out @ 4510:e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Rationale for not aborting instead:
The first parent is usually more important as it is the local branch
during a merge and commands like 'hg diff' and 'hg diff -r.' behave still
identically (except for the warning of course).
Added a test for log -r. with one and two parents.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 06 Jun 2007 19:05:18 +0200 |
parents | 9d1c3529ebbc |
children | ca023b63ba1f |
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