tests/test-pull
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 06 Jun 2007 19:05:18 +0200
changeset 4510 e0bc2c575044
parent 3736 ad3d5b4367cb
child 4891 2d545b98a7bc
permissions -rwxr-xr-x
Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.
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
2571
83cfd95eafb5 tests: add timeouts, make run-tests.py clean up dead daemon processes
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1929
diff changeset
    11
cat hg.pid >> $DAEMON_PIDS
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
2612
ffb895f16925 add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2571
diff changeset
    14
http_proxy= hg clone --pull 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
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 2612
diff changeset
    19
hg manifest --debug
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 495
diff changeset
    20
hg pull