view tests/test-conflict @ 8551:7089d9727867

inotify: modular architecture for inotify clients

Put the socket init, query generation and response analysis in
a more generic client class.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status