Mercurial > hg
view tests/test-inotify-debuginotify.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 | 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`