Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-hup @ 2548:0229ff95faec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents 9419855309cd
children c0b449154a90
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
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 ls .hg
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
15
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
16