Mercurial > hg
view tests/test-inotify-debuginotify.t @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 31 May 2011 11:52:22 -0700 |
parents | 17ebf11bff81 |
children | 104e120416ec |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ hg init $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH inserve $ hg inserve -d --pid-file=hg.pid $ cat hg.pid >> "$DAEMON_PIDS" let the daemon finish its stuff $ sleep 1 empty $ hg debuginotify directories being watched: / .hg/ $ mkdir a $ sleep 1 only 'a $ hg debuginotify directories being watched: / .hg/ a/ $ rmdir a $ sleep 1 empty again $ hg debuginotify directories being watched: / .hg/ $ kill `cat hg.pid`