Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bad-pull @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | d22d730c96ed |
children | 7012c889e8f2 |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
705
diff
changeset
|
1 #!/bin/sh |
395 | 2 |
485 | 3 hg clone http://localhost:20059/ copy |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
495
diff
changeset
|
4 echo $? |
1962
2a676ad52c22
tests: more portability fix for the old systems
TK Soh <teekaysoh@yahoo.com>
parents:
1927
diff
changeset
|
5 ls copy 2>/dev/null || echo copy: No such file or directory |
395 | 6 |
7 cat > dumb.py <<EOF | |
8 import BaseHTTPServer, SimpleHTTPServer, signal | |
9 | |
10 def run(server_class=BaseHTTPServer.HTTPServer, | |
11 handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler): | |
12 server_address = ('localhost', 20059) | |
13 httpd = server_class(server_address, handler_class) | |
14 httpd.serve_forever() | |
15 | |
16 signal.signal(signal.SIGTERM, lambda x: sys.exit(0)) | |
17 run() | |
18 EOF | |
19 | |
20 python dumb.py 2>/dev/null & | |
2571
d22d730c96ed
tests: record few more daemon pids to be safe
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2438
diff
changeset
|
21 echo $! >> $DAEMON_PIDS |
395 | 22 |
2438
a765f853439d
test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1962
diff
changeset
|
23 http_proxy= hg clone http://localhost:20059/foo copy2 2>&1 | \ |
a765f853439d
test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1962
diff
changeset
|
24 sed -e 's/404.*/404/' -e 's/Date:.*/Date:/' |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
495
diff
changeset
|
25 echo $? |
395 | 26 |
492
9bd468e36de3
Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
27 kill $! |