Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-bad-pull @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents e3a0c092b4e2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
2
5384
e3a0c092b4e2 Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4317
diff changeset
3 hg clone http://localhost:$HGPORT/ copy
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 495
diff changeset
4 echo $?
3464
33b6c8193652 Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3418
diff changeset
5 test -d copy || echo copy: No such file or directory
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
6
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
7 cat > dumb.py <<EOF
5384
e3a0c092b4e2 Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4317
diff changeset
8 import BaseHTTPServer, SimpleHTTPServer, os, signal
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
9
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
10 def run(server_class=BaseHTTPServer.HTTPServer,
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
11 handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
5384
e3a0c092b4e2 Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4317
diff changeset
12 server_address = ('localhost', int(os.environ['HGPORT']))
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
13 httpd = server_class(server_address, handler_class)
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
14 httpd.serve_forever()
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
15
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
16 signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
17 run()
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
18 EOF
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
19
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
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
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
22
4317
66249be9aa23 test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3464
diff changeset
23 # give the server some time to start running
66249be9aa23 test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3464
diff changeset
24 sleep 1
66249be9aa23 test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3464
diff changeset
25
5384
e3a0c092b4e2 Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4317
diff changeset
26 http_proxy= hg clone http://localhost:$HGPORT/foo copy2 2>&1 | \
2438
a765f853439d test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1962
diff changeset
27 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
28 echo $?
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
29
492
9bd468e36de3 Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
30 kill $!