Mercurial > hg
view tests/test-bad-extension.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 | 6cc4b14fb76b |
children | 1f9e11f65cd7 |
line wrap: on
line source
$ echo 'raise Exception("bit bucket overflow")' > badext.py $ abspath=`pwd`/badext.py $ echo '[extensions]' >> $HGRCPATH $ echo "gpg =" >> $HGRCPATH $ echo "hgext.gpg =" >> $HGRCPATH $ echo "badext = $abspath" >> $HGRCPATH $ echo "badext2 =" >> $HGRCPATH $ hg -q help help *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension badext2: No module named badext2 hg help [TOPIC] show help for a given topic or a help overview