tests/test-unrelated-pull
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 04 Aug 2006 10:38:17 -0700
changeset 2787 0148869345f7
parent 1960 dac4bd67f6c5
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
merge with self.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 579
diff changeset
     1
#!/bin/sh
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 579
diff changeset
     2
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     3
mkdir a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     4
cd a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     5
hg init
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     6
echo 123 > a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
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: 1308
diff changeset
     8
hg commit -m "a" -u a -d "1000000 0"
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
     9
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    10
cd ..
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    11
mkdir b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    12
cd b
1308
2073e5a71008 Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    13
hg init
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    14
echo 321 > b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
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: 1308
diff changeset
    16
hg commit -m "b" -u b -d "1000000 0"
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    17
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    18
hg pull ../a
1960
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
    19
hg pull -f ../a
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset
    20
hg heads