##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r3918:a413f5c2 default
r6385:0d4e068e default
Show More
test-hup
13 lines | 159 B | text/plain | TextLexer
Matt Mackall
Update tests
r642 #!/bin/sh
hg init
mkfifo p
hg serve --stdio < p &
P=$!
(echo lock; echo addchangegroup; sleep 5) > p &
Q=$!
Sascha Wilde
Some systems are slower ... give 'em some time/
r2529 sleep 3
Matt Mackall
Update tests
r642 kill -HUP $P
Thomas Arendsen Hein
Exit test-hup only after the background process has died....
r2088 wait
Thomas Arendsen Hein
Fix test-hup for different output of ls on at least MacOS X and Solaris 8.
r3918 echo .hg/* .hg/store/*