Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-hup @ 5483:0c43f87baba3 default tip
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 | a413f5c29c46 |
children |
rev | line source |
---|---|
642 | 1 #!/bin/sh |
2 | |
3 hg init | |
4 mkfifo p | |
5 | |
6 hg serve --stdio < p & | |
7 P=$! | |
8 (echo lock; echo addchangegroup; sleep 5) > p & | |
9 Q=$! | |
2529
9419855309cd
Some systems are slower ... give 'em some time/
Sascha Wilde <wilde@sha-bang.de>
parents:
2088
diff
changeset
|
10 sleep 3 |
642 | 11 kill -HUP $P |
2088
f16435b45780
Exit test-hup only after the background process has died.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
12 wait |
3917
a413f5c29c46
Fix test-hup for different output of ls on at least MacOS X and Solaris 8.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3853
diff
changeset
|
13 echo .hg/* .hg/store/* |