view tests/test-rename-dir-merge2 @ 8788:5d8021ac0e19

inotify: raise QueryFailed when the server crash

When the server crashes, it does not write back on the socket. The message
which is then read from the socket is '', which raises a TypeError.
Catching TypeError to raise QueryFailed instead.

#!/bin/sh

mkdir r1
cd r1
hg init
mkdir a
echo foo > a/f
hg add a
hg ci -m "a/f == foo"
cd ..

hg clone r1 r2
cd r2
hg mv a b
echo foo1 > b/f
hg ci -m" a -> b, b/f == foo1"
cd ..

cd r1
mkdir a/aa
echo bar > a/aa/g
hg add a/aa
hg ci -m "a/aa/g"
hg pull ../r2

hg merge

hg st -C