Mercurial > hg-stable
changeset 7465:8f0305874701
tests: allow cvs import to reorder its filename list
Also fix script to generate non-zero length test file b.
| author | Frank Kingswood <frank@kingswood-consulting.co.uk> |
|---|---|
| date | Mon, 01 Dec 2008 13:42:04 +0000 |
| parents | 3a829f29d1e2 |
| children | 0d1c5e638d07 3e5db4228f8f |
| files | tests/test-convert-cvs-branch tests/test-convert-cvs-branch.out |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-cvs-branch Wed Dec 03 01:28:33 2008 +0100 +++ b/tests/test-convert-cvs-branch Mon Dec 01 13:42:04 2008 +0000 @@ -28,8 +28,9 @@ mkdir src cd src -echo "1" > a > b -cvscall import -m "init" src v0 r0 +echo "1" > a +echo "1" > b +cvscall import -m "init" src v0 r0 | sort cd .. cvscall co src cd src
--- a/tests/test-convert-cvs-branch.out Wed Dec 03 01:28:33 2008 +0100 +++ b/tests/test-convert-cvs-branch.out Mon Dec 01 13:42:04 2008 +0000 @@ -1,10 +1,10 @@ % create cvs repository % Create a new project + + N src/a N src/b - No conflicts created by this import - cvs checkout: Updating src U src/a U src/b