Mercurial > hg
view tests/test-inotify-issue1371.t @ 18300:745bc16ccef2
largefiles: fix update from a merge with removed files
A situation with this case could happen after interrupting an update. Update
would fail with:
abort: No such file or directory: $TESTTMP/f/.hglf/sub2/large6
Update from a merge without using clean is not possible anyway, so this patch
takes a step in the right direction so it gets as far as reporting the right
error.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 11 Jan 2013 16:30:29 +0100 |
parents | adeb9dad3df6 |
children | f58175f409b0 |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ hg init $ touch a b c d e f $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH inserve $ hg inserve -d --pid-file=hg.pid 2>&1 $ cat hg.pid >> "$DAEMON_PIDS" $ hg ci -Am m adding a adding b adding c adding d adding e adding f adding hg.pid let the daemon finish its stuff $ sleep 1 eed to test all file operations $ hg rm a $ rm b $ echo c >> c $ touch g $ hg add g $ hg mv e h $ hg status M c A g A h R a R e ! b $ sleep 1 Are we able to kill the service? if not, the service died on some error $ kill `cat hg.pid`