Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-bad-pull @ 566:b2c9b36bd639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repo.changes: fix duplicate changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 repo.changes: fix duplicate changes We need to discard the changed and added lists from dirstate.changes before adding to them when comparing manifests. Otherwise something that changed from rev->parent->working dir will appear twice. Bug spotted by Goffredo Baroncelli <kreijack@libero.it> manifest hash: 64c335e2fe6df6d1ce29d0903f16821c7566768f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcT3ywK+sNU5EO8RAivLAJ4gqbWfMnt+BdyGac/ZGduy2KbNegCgncPV D4ay6Qw9sIodEPjRebvk3GE= =AZd2 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 14:34:31 -0800
parents 4fc63e22b1fe
children 085a8145e151 574869103985
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 503
diff changeset
1 #!/bin/sh -x
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
2
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 395
diff changeset
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 $?
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 495
diff changeset
5 ls copy
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
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
8 import BaseHTTPServer, SimpleHTTPServer, signal
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):
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
12 server_address = ('localhost', 20059)
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 &
545
721bfca3a9dc Work-around failing tests/test-bad-pull with slow bg process.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 544
diff changeset
21 sleep 2
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
22
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 395
diff changeset
23 hg clone http://localhost:20059/foo copy2
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 495
diff changeset
24 echo $?
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
25
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 495
diff changeset
26 set +x
492
9bd468e36de3 Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
27 kill $!