Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 30247:27addd7e8eca stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tag: clarify warning about making a tag on a branch head Currently the warning is ambiguous about whether the new tag (possibly specified via --rev) is being added on a branch head or whether the working directory is based on a branch head. Clarify the error message to eliminate this ambiguity.
author Nathan Goldbaum <ngoldbau@illinois.edu>
date Mon, 31 Oct 2016 17:12:32 -0500
parents 7b7bd704adbd
children ba2c04059317
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Nov 01 20:39:37 2016 +0900
+++ b/mercurial/commands.py	Mon Oct 31 17:12:32 2016 -0500
@@ -7077,7 +7077,8 @@
                 raise error.Abort(_('uncommitted merge'))
             bheads = repo.branchheads()
             if not opts.get('force') and bheads and p1 not in bheads:
-                raise error.Abort(_('not at a branch head (use -f to force)'))
+                raise error.Abort(_('working directory is not at a branch head '
+                                    '(use -f to force)'))
         r = scmutil.revsingle(repo, rev_).node()
 
         if not message: