Mercurial > hg
view tests/test-inotify-dirty-dirstate.t @ 12765:5eed9ceebd64
merge: when --tool is specified, disable HGMERGE by setting to empty string
HGMERGE has different semantics than ui.merge. HGMERGE should hold the name
on an executable in your path, or an absolute tool path. As such, it's not
safe to simply copy the user's specified --tool value into HGMERGE. Instead,
we disable HGMERGE by setting it to an empty string.
author | Steve Borho <steve@borho.org> |
---|---|
date | Mon, 18 Oct 2010 23:20:14 -0500 |
parents | f727db60abb4 |
children | ffb5c09ba822 |
line wrap: on
line source
issues when status queries are issued when dirstate is dirty $ "$TESTDIR/hghave" inotify || exit 80 $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH $ echo "fetch=" >> $HGRCPATH issue1810: inotify and fetch $ mkdir test; cd test $ hg init $ hg inserve -d --pid-file=../hg.pid $ cat ../hg.pid >> "$DAEMON_PIDS" $ echo foo > foo $ hg add adding foo $ hg ci -m foo $ cd .. $ hg --config "inotify.pidfile=../hg2.pid" clone test test2 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat ../hg2.pid >> "$DAEMON_PIDS" $ cd test2 $ echo bar > bar $ hg add adding bar $ hg ci -m bar $ cd ../test $ echo spam > spam $ hg add adding spam $ hg ci -m spam $ cd ../test2 $ hg st abort, outstanding changes $ hg fetch -q $ hg st $ cd .. issue1719: inotify and mq $ echo "mq=" >> $HGRCPATH $ hg init test-1719 $ cd test-1719 inserve $ hg inserve -d --pid-file=../hg-test-1719.pid $ cat ../hg-test-1719.pid >> "$DAEMON_PIDS" $ echo content > file $ hg add file $ hg qnew -f test.patch $ hg status $ hg qpop popping test.patch patch queue now empty st should not output anything $ hg status $ hg qpush applying test.patch now at: test.patch st should not output anything $ hg status $ hg qrefresh $ hg status