Mercurial > hg

view tests/test-simplemerge.py.out @ 13134:ea3c93b53fdb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2e3c54fb79a3
children f18830651811
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK