tests/test-pull
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 814 0902ffece4b4
child 1744 385b06493465
child 1927 397b62d5dd13
permissions -rwxr-xr-x
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
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
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents: 619
diff changeset
    10
hg serve -p 20059 > /dev/null &
790
d7380783a086 Make test-pull work on slow machines, where hg serve needs some time to start.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
    11
sleep 1 # wait for server to be started
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    12
cd ..
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    13
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 392
diff changeset
    14
hg clone http://localhost:20059/ copy
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    15
cd copy
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    16
hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    17
hg co
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    18
cat foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    19
hg manifest
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 495
diff changeset
    20
hg pull
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    21
492
9bd468e36de3 Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
    22
kill $!