annotate tests/test-hup @ 5390:36c46e20976a

merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 03 Oct 2007 23:09:36 +0200
parents a413f5c29c46
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 #!/bin/sh
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 hg init
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 mkfifo p
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 hg serve --stdio < p &
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 P=$!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 (echo lock; echo addchangegroup; sleep 5) > p &
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
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
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
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/*