subrepo: re-backout
2245fcd0e160, remove test
7397a53219c9 re-removed the bad fix but not the test.
subrepo: re-backout
2245fcd0e160
This bug got introduced into default simultaneously with its backout,
so future merges didn't eradicate it.
tag: abort if not at a branch head (
issue2552)
Since it's usually only desirable to make tag commits on top of branch
heads, abort if the working dir parent is not a branch head. -f/--force
may be passed to commit at a non-head anyway.
Does not abort if working dir parent is a named branch head but not a
topological head.
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.
tag: don't check .hgtags status if --local passed
Local tags don't create a commit, so we don't need to check the status
of .hgtags.