view tests/test-serve.out @ 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.

% Without -v
access log created - .hg/hgrc respected
% errors
% With -v
listening at http://localhost/ (bound to 127.0.0.1:HGPORT1)
% errors
% With -v and -p HGPORT2
listening at http://localhost/ (bound to 127.0.0.1:HGPORT2)
% errors
% With -v and -p daytime (should fail because low port)
abort: cannot start server at 'localhost:13': Permission denied
abort: child process failed to start
% errors
% With --prefix foo
listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
% errors
% With --prefix /foo
listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
% errors
% With --prefix foo/
listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
% errors
% With --prefix /foo/
listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
% errors