tests/test-basic
author mpm@selenic.com
Wed, 15 Jun 2005 00:27:20 -0800
changeset 346 f69a5d2d4fe1
parent 331 55f63f3b6a54
child 349 b2293093b89e
child 350 b4e0e20646bb
permissions -rwxr-xr-x
merge3: fix argument order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge3: fix argument order We were passing the wrong argument order to hgmerge. Add a merge conflict test case. manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF ooZT2fyN3tL3uVM2YP8KcA== =O4fE -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/bash
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     3
set -x
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     4
mkdir t
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     5
cd t
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     6
hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     7
echo a > a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     8
hg add a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     9
hg commit -t "test" -u test -d "0 0"
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    10
hg history
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    11
hg manifest
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    12
hg cat a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    13
hg verify