tests/test-hup
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 7080 a6477aa893b8
permissions -rwxr-xr-x
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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/*