tests/test-merge2
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 13 Mar 2006 13:05:41 +0100
changeset 1933 7544700fd931
parent 814 0902ffece4b4
child 3988 9dcf9d45cab8
permissions -rwxr-xr-x
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
800
ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
     1
#!/bin/sh
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
     8
hg commit -m "commit #0" -d "1000000 0"
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    11
hg commit -m "commit #1" -d "1000000 0"
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    16
hg commit -m "commit #2" -d "1000000 0"
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    24
hg commit -m "commit #0" -d "1000000 0"
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    27
hg commit -m "commit #1" -d "1000000 0"
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    31
hg commit -A -m "commit #2" -d "1000000 0"
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    39
hg commit -m "commit #0" -d "1000000 0"
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    42
hg commit -m "commit #1" -d "1000000 0"
409
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    47
hg commit -A -m "commit #2" -d "1000000 0"
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    48
cd ..; /bin/rm -rf t