Mercurial > hg
view tests/test-inotify-issue1371 @ 12317:ed639917c825 stable
test-eol-update: record new results as correct
Changeset 0852da25a31b changed the result of this test. The 'hg update 0'
command, which causes a merge of modified a.txt, now leaves a.txt in the
EOLN format specified by .hgeol as it was committed in revision 0.
Previously, it used the .hgeol contents from the working directory before the
update.
author | Steve Borho <steve@borho.org> |
---|---|
date | Fri, 17 Sep 2010 12:44:35 -0500 |
parents | 5ab0abf27dd9 |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" inotify || exit 80 hg init touch a b c d e f echo "[extensions]" >> $HGRCPATH echo "inotify=" >> $HGRCPATH echo inserv1 echo % inserve hg inserve -d --pid-file=hg.pid 2>&1 cat hg.pid >> "$DAEMON_PIDS" hg ci -Am m # let the daemon finish its stuff sleep 1 #Need to test all file opperations hg rm a rm b echo c >> c touch g hg add g hg mv e h hg status sleep 1 echo "Are we able to kill the service? if not, the service died on some error" kill `cat hg.pid`