Mercurial > hg-stable

annotate tests/test-hup @ 10251:a19d2993385d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix merging of already merged subrepos (issue1986) This fixes a bug seen when merging a main repo which contains a subrepo when both repos have been merged before. Each repo (main and sub) has two branches, both of which have been merged before. In a subrepo, if the revision to merge to is an ancestor of the current rev, then the merge should be a noop. Test provided by Steve Losh.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 15 Jan 2010 21:08:04 +0100
parents a6477aa893b8
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
7080
a6477aa893b8 tests: Windows compatibility fixes
Patrick Mezard <pmezard@gmail.com>
parents: 3918
diff changeset
3 "$TESTDIR/hghave" fifo || exit 80
a6477aa893b8 tests: Windows compatibility fixes
Patrick Mezard <pmezard@gmail.com>
parents: 3918
diff changeset
4
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 hg init
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 mkfifo p
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 hg serve --stdio < p &
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 P=$!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 (echo lock; echo addchangegroup; sleep 5) > p &
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
11 Q=$!
2529
9419855309cd Some systems are slower ... give 'em some time/
Sascha Wilde <wilde@sha-bang.de>
parents: 2088
diff changeset
12 sleep 3
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 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
14 wait
3918
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
15 echo .hg/* .hg/store/*