Mercurial > hg
view tests/test-no-symlinks.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.
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Tue, 07 Dec 2010 08:02:54 +0100 |
parents | 158fa833d243 |
children |
line wrap: on
line source
% unbundle 4 files updated, 0 files merged, 0 files removed, 0 files unresolved a d/b % move and copy a d/b % bundle 2 changesets found pulling from ../symlinks.hg requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 6 changes to 6 files (run 'hg update' to get a working copy) 5 files updated, 0 files merged, 0 files removed, 0 files unresolved a a d/b