comparison tests/test-mq-merge.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 9510ddf87c43
comparison
equal deleted inserted replaced
13133:c1492615cdee 13134:ea3c93b53fdb