Mercurial > hg
view tests/test-inotify-issue1542.t @ 13134:ea3c93b53fdb stable
tag: fix uncommitted merge check and error message (issue2542)
This patch corrects the check for tagging on an uncommitted merge. We
should never commit a new tag changeset on an uncommitted merge, whether
or not --rev is specified. It also changes the error message from:
abort: cannot partially commit a merge (do not specify files or patterns)
to the much more accurate (and terse):
abort: uncommitted merge
Local tags are ok.
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Tue, 07 Dec 2010 08:02:54 +0100 |
parents | 92b2c876a79d |
children | f7c4eb60b0c3 |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ hg init $ touch a $ mkdir dir $ touch dir/b $ touch dir/c $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH $ hg add dir/c inserve $ hg inserve -d --pid-file=hg.pid 2>&1 $ cat hg.pid >> "$DAEMON_PIDS" $ hg st A dir/c ? a ? dir/b ? hg.pid moving dir out $ mv dir ../tmp-test-inotify-issue1542 status $ hg st ! dir/c ? a ? hg.pid $ sleep 1 Are we able to kill the service? if not, the service died on some error $ kill `cat hg.pid`