Mercurial > hg > gitweb
annotate tests/test-conflict @ 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 | 4fc63e22b1fe |
children | eb46971fc57f |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
392
diff
changeset
|
1 #!/bin/sh |
346 | 2 |
3 set -x | |
4 hg init | |
5 echo "nothing" > a | |
6 hg add a | |
7 hg commit -t ancestor -u test -d "0 0" | |
8 echo "something" > a | |
9 hg commit -t branch1 -u test -d "0 0" | |
10 hg co 0 | |
11 echo "something else" > a | |
12 hg commit -t branch2 -u test -d "0 0" | |
13 export HGMERGE=merge | |
14 hg -d up -m 1 | |
15 hg id | |
392 | 16 grep -Ev ">>>|<<<" a |
346 | 17 hg status |