Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-hup @ 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 | 9419855309cd |
| children | c0b449154a90 |
| 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 |
| 642 | 13 ls .hg |
| 14 | |
| 15 | |
| 16 |