tests/test-merge2
author mpm@selenic.com
Tue, 21 Jun 2005 18:51:06 -0800
changeset 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Pick up tests from previous patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pick up tests from previous patch manifest hash: 3ec4c3cb96e15322f7489d89b7b92ee214f6cfb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNIaywK+sNU5EO8RAuGOAJ9YXXfXstC6wysknsXPAL9jDeiUDwCgpFJ3 P5goy7Zw3ypinBEwZrhgXM8= =6fKs -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/sh -x
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     2
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     3
mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     4
cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     5
hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     6
echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     7
hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     8
hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
     9
echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    10
hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    11
hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    12
rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    13
hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    14
echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    15
hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    16
hg commit -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    17
cd ..; /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    18
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    19
mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    20
cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    21
hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    22
echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    23
hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    24
hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    25
echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    26
hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    27
hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    28
rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    29
hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    30
echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    31
hg commit -A -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    32
cd ..; /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    33
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    34
mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    35
cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    36
hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    37
echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    38
hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    39
hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    40
echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    41
hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    42
hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    43
rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    44
hg remove b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    45
hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    46
echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    47
hg commit -A -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    48
cd ..; /bin/rm -rf t