Mercurial > hg
annotate tests/test-bad-pull @ 4531:b51a8138292a
Avoid extra filelogs entries.
Right now, there are some situations in which localrepo.filecommit can
create filelog entries even though they're not needed. For example:
- permissions for a file have changed;
- qrefresh can create a filelog entry identical to its parent (see the
added test);
- convert-repo creates extra filelog entries in every merge where the
first parent has added files (for example, changeset ebebe9577a1a of
the kernel repo added extra filelog entries to files in the
arch/blackfin directory, even though the merge should only touch the
drivers/ata directory). This makes "hg log file" in a converted repo
less useful than it could be, since it may mention many merges that
don't actually touch that specific file.
They all come from the same basic problem: localrepo.commit (through
filecommit) creates new filelog entries for all files passed to it
(except for some cases during a merge).
Patch and test case provided by Benoit.
This should fix issue351.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 09 Jun 2007 01:04:28 -0300 |
parents | 66249be9aa23 |
children | e3a0c092b4e2 |
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 $? |
3469
33b6c8193652
Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3428
diff
changeset
|
5 test -d copy || 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 & | |
2572
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 |
4317
66249be9aa23
test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3469
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:
3469
diff
changeset
|
24 sleep 1 |
66249be9aa23
test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3469
diff
changeset
|
25 |
2438
a765f853439d
test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1962
diff
changeset
|
26 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
|
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 | 29 |
492
9bd468e36de3
Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
30 kill $! |