Mercurial > hg
view tests/test-archive.out @ 4884:931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
If one side's revision is identical to the ancestor, we skip the rest
of the copy detection logic.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Jul 2007 14:43:38 -0500 |
parents | 0e2d0a78f81a |
children | 192cd95c2ba8 a49f2a4d5ff7 |
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