Mercurial > hg
view tests/test-inotify-lookup.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 | 5ae8711ea324 |
children | a9e830ecd9fb |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ hg init $ echo "[extensions]" > .hg/hgrc $ echo "inotify=" >> .hg/hgrc $ hg inserve -d --pid-file .hg/inotify.pid $ echo a > a $ hg ci -Aqm0 $ hg co -q null $ hg co -q $ hg st $ cat a a $ kill `cat .hg/inotify.pid`