tests/test-pull
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 11 May 2006 09:43:50 -0700
changeset 2264 fdb699b5e132
parent 1929 85daa4e03b4c
child 2571 83cfd95eafb5
permissions -rwxr-xr-x
localrepo.update: abort if outstanding merges, instead of warn/return 1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 522
diff changeset
     1
#!/bin/sh
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     2
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     3
mkdir test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     4
cd test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     5
echo foo>foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     6
hg init
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     7
hg addremove
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 642
diff changeset
     8
hg commit -m 1
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     9
hg verify
1786
ffb584a182d1 Don't use mktemp in tests, we're already in a secure temp dir.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1744
diff changeset
    10
hg serve -p 20059 -d --pid-file=hg.pid
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    11
cd ..
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    12
1927
397b62d5dd13 add http_proxy= lines to test-bad-pull and test-pull
Peter van Dijk <peter@dataloss.nl>
parents: 814
diff changeset
    13
http_proxy= hg clone http://localhost:20059/ copy
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    14
cd copy
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    15
hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    16
hg co
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    17
cat foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    18
hg manifest
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 495
diff changeset
    19
hg pull
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    20
1786
ffb584a182d1 Don't use mktemp in tests, we're already in a secure temp dir.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1744
diff changeset
    21
kill `cat ../test/hg.pid`