Mercurial > hg > gitweb
view tests/test-merge1 @ 550:96ff7dae94f7
[PATCH] Tests for clone command
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Tests for clone command
From: Bryan O'Sullivan <bos@serpentine.com>
This patch adds two new tests. One tests clone's correct operation, the
other that clone fails when it should.
This patch depends on oserror.patch.
manifest hash: a0c9c4932baf29e7b33b2bd2003ddd2254ce65d3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxPX9ywK+sNU5EO8RAmSNAJ9esixtATdkszwLltu65dzpKf6P4gCcCqGT
+Z7CTbXRTFcJvmXFlvEo0xE=
=6fqz
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 30 Jun 2005 23:51:25 -0800 |
parents | 5b22029b5aa2 |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user hg update 0 echo This is file c1 > c hg add c hg commit -t "commit #2" -d "0 0" -u user echo This is file b1 > b env HGMERGE=../merge hg update -m 1 # no merges expected cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user hg update 0 echo This is file c1 > c hg add c hg commit -t "commit #2" -d "0 0" -u user echo This is file b2 > b env HGMERGE=../merge hg update -m 1 # merge of b expected cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user echo This is file b22 > b hg commit -t "commit #2" -d "0 0" -u user hg update 1 echo This is file c1 > c hg add c hg commit -t "commit #3" -d "0 0" -u user cat b echo This is file b22 > b env HGMERGE=../merge hg update -m 2 # merge expected! cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user echo This is file b22 > b hg commit -t "commit #2" -d "0 0" -u user hg update 1 echo This is file c1 > c hg add c hg commit -t "commit #3" -d "0 0" -u user echo This is file b33 > b env HGMERGE=../merge hg update -m 2 # merge of b expected cd ..; /bin/rm -rf t