filemerge: switch the default name for internal tools from internal:x to :x

mercurial/filemerge.py

@@ -1,471 +1,471 b''
 # filemerge.py - file-level merge handling for Mercurial
 #
 # Copyright 2006, 2007, 2008 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from node import short
 from i18n import _
 import util, simplemerge, match, error, templater, templatekw
 import os, tempfile, re, filecmp
 import tagmerge
 
 def _toolstr(ui, tool, part, default=""):
     return ui.config("merge-tools", tool + "." + part, default)
 
 def _toolbool(ui, tool, part, default=False):
     return ui.configbool("merge-tools", tool + "." + part, default)
 
 def _toollist(ui, tool, part, default=[]):
     return ui.configlist("merge-tools", tool + "." + part, default)
 
 internals = {}
 
 def internaltool(name, trymerge, onfailure=None):
     '''return a decorator for populating internal merge tool table'''
     def decorator(func):
-        fullname = 'internal:' + name
+        fullname = ':' + name
         func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip()
         internals[fullname] = func
-        internals[':' + name] = func
+        internals['internal:' + name] = func
         func.trymerge = trymerge
         func.onfailure = onfailure
         return func
     return decorator
 
 def _findtool(ui, tool):
     if tool in internals:
         return tool
     for kn in ("regkey", "regkeyalt"):
         k = _toolstr(ui, tool, kn)
         if not k:
             continue
         p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
         if p:
             p = util.findexe(p + _toolstr(ui, tool, "regappend"))
             if p:
                 return p
     exe = _toolstr(ui, tool, "executable", tool)
     return util.findexe(util.expandpath(exe))
 
 def _picktool(repo, ui, path, binary, symlink):
     def check(tool, pat, symlink, binary):
         tmsg = tool
         if pat:
             tmsg += " specified for " + pat
         if not _findtool(ui, tool):
             if pat: # explicitly requested tool deserves a warning
                 ui.warn(_("couldn't find merge tool %s\n") % tmsg)
             else: # configured but non-existing tools are more silent
                 ui.note(_("couldn't find merge tool %s\n") % tmsg)
         elif symlink and not _toolbool(ui, tool, "symlink"):
             ui.warn(_("tool %s can't handle symlinks\n") % tmsg)
         elif binary and not _toolbool(ui, tool, "binary"):
             ui.warn(_("tool %s can't handle binary\n") % tmsg)
         elif not util.gui() and _toolbool(ui, tool, "gui"):
             ui.warn(_("tool %s requires a GUI\n") % tmsg)
         else:
             return True
         return False
 
     # forcemerge comes from command line arguments, highest priority
     force = ui.config('ui', 'forcemerge')
     if force:
         toolpath = _findtool(ui, force)
         if toolpath:
             return (force, util.shellquote(toolpath))
         else:
             # mimic HGMERGE if given tool not found
             return (force, force)
 
     # HGMERGE takes next precedence
     hgmerge = os.environ.get("HGMERGE")
     if hgmerge:
         return (hgmerge, hgmerge)
 
     # then patterns
     for pat, tool in ui.configitems("merge-patterns"):
         mf = match.match(repo.root, '', [pat])
         if mf(path) and check(tool, pat, symlink, False):
             toolpath = _findtool(ui, tool)
             return (tool, util.shellquote(toolpath))
 
     # then merge tools
     tools = {}
     for k, v in ui.configitems("merge-tools"):
         t = k.split('.')[0]
         if t not in tools:
             tools[t] = int(_toolstr(ui, t, "priority", "0"))
     names = tools.keys()
     tools = sorted([(-p, t) for t, p in tools.items()])
     uimerge = ui.config("ui", "merge")
     if uimerge:
         if uimerge not in names:
             return (uimerge, uimerge)
         tools.insert(0, (None, uimerge)) # highest priority
     tools.append((None, "hgmerge")) # the old default, if found
     for p, t in tools:
         if check(t, None, symlink, binary):
             toolpath = _findtool(ui, t)
             return (t, util.shellquote(toolpath))
 
     # internal merge or prompt as last resort
     if symlink or binary:
-        return "internal:prompt", None
-    return "internal:merge", None
+        return ":prompt", None
+    return ":merge", None
 
 def _eoltype(data):
     "Guess the EOL type of a file"
     if '\0' in data: # binary
         return None
     if '\r\n' in data: # Windows
         return '\r\n'
     if '\r' in data: # Old Mac
         return '\r'
     if '\n' in data: # UNIX
         return '\n'
     return None # unknown
 
 def _matcheol(file, origfile):
     "Convert EOL markers in a file to match origfile"
     tostyle = _eoltype(util.readfile(origfile))
     if tostyle:
         data = util.readfile(file)
         style = _eoltype(data)
         if style:
             newdata = data.replace(style, tostyle)
             if newdata != data:
                 util.writefile(file, newdata)
 
 @internaltool('prompt', False)
 def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf):
     """Asks the user which of the local or the other version to keep as
     the merged version."""
     ui = repo.ui
     fd = fcd.path()
 
     if ui.promptchoice(_(" no tool found to merge %s\n"
                          "keep (l)ocal or take (o)ther?"
                          "$$ &Local $$ &Other") % fd, 0):
         return _iother(repo, mynode, orig, fcd, fco, fca, toolconf)
     else:
         return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf)
 
 @internaltool('local', False)
 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf):
     """Uses the local version of files as the merged version."""
     return 0
 
 @internaltool('other', False)
 def _iother(repo, mynode, orig, fcd, fco, fca, toolconf):
     """Uses the other version of files as the merged version."""
     repo.wwrite(fcd.path(), fco.data(), fco.flags())
     return 0
 
 @internaltool('fail', False)
 def _ifail(repo, mynode, orig, fcd, fco, fca, toolconf):
     """
     Rather than attempting to merge files that were modified on both
     branches, it marks them as unresolved. The resolve command must be
     used to resolve these conflicts."""
     return 1
 
 def _premerge(repo, toolconf, files, labels=None):
     tool, toolpath, binary, symlink = toolconf
     if symlink:
         return 1
     a, b, c, back = files
 
     ui = repo.ui
 
     validkeep = ['keep', 'keep-merge3']
 
     # do we attempt to simplemerge first?
     try:
         premerge = _toolbool(ui, tool, "premerge", not binary)
     except error.ConfigError:
         premerge = _toolstr(ui, tool, "premerge").lower()
         if premerge not in validkeep:
             _valid = ', '.join(["'" + v + "'" for v in validkeep])
             raise error.ConfigError(_("%s.premerge not valid "
                                       "('%s' is neither boolean nor %s)") %
                                     (tool, premerge, _valid))
 
     if premerge:
         if premerge == 'keep-merge3':
             if not labels:
                 labels = _defaultconflictlabels
             if len(labels) < 3:
                 labels.append('base')
         r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels)
         if not r:
             ui.debug(" premerge successful\n")
             return 0
         if premerge not in validkeep:
             util.copyfile(back, a) # restore from backup and try again
     return 1 # continue merging
 
 @internaltool('merge', True,
               _("merging %s incomplete! "
                 "(edit conflicts, then use 'hg resolve --mark')\n"))
 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will fail if there are any conflicts and leave markers in
     the partially merged file. Markers will have two sections, one for each side
     of merge."""
     tool, toolpath, binary, symlink = toolconf
     if symlink:
-        repo.ui.warn(_('warning: internal:merge cannot merge symlinks '
+        repo.ui.warn(_('warning: internal :merge cannot merge symlinks '
                        'for %s\n') % fcd.path())
         return False, 1
     r = _premerge(repo, toolconf, files, labels=labels)
     if r:
         a, b, c, back = files
 
         ui = repo.ui
 
         r = simplemerge.simplemerge(ui, a, b, c, label=labels)
         return True, r
     return False, 0
 
 @internaltool('merge3', True,
               _("merging %s incomplete! "
                 "(edit conflicts, then use 'hg resolve --mark')\n"))
 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will fail if there are any conflicts and leave markers in
     the partially merged file. Marker will have three sections, one from each
     side of the merge and one for the base content."""
     if not labels:
         labels = _defaultconflictlabels
     if len(labels) < 3:
         labels.append('base')
     return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels)
 
 @internaltool('tagmerge', True,
               _("automatic tag merging of %s failed! "
-                "(use 'hg resolve --tool internal:merge' or another merge "
+                "(use 'hg resolve --tool :merge' or another merge "
                 "tool of your choice)\n"))
 def _itagmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
     Uses the internal tag merge algorithm (experimental).
     """
     return tagmerge.merge(repo, fcd, fco, fca)
 
 @internaltool('dump', True)
 def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
     Creates three versions of the files to merge, containing the
     contents of local, other and base. These files can then be used to
     perform a merge manually. If the file to be merged is named
     ``a.txt``, these files will accordingly be named ``a.txt.local``,
     ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
     same directory as ``a.txt``."""
     r = _premerge(repo, toolconf, files, labels=labels)
     if r:
         a, b, c, back = files
 
         fd = fcd.path()
 
         util.copyfile(a, a + ".local")
         repo.wwrite(fd + ".other", fco.data(), fco.flags())
         repo.wwrite(fd + ".base", fca.data(), fca.flags())
     return False, r
 
 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     r = _premerge(repo, toolconf, files, labels=labels)
     if r:
         tool, toolpath, binary, symlink = toolconf
         a, b, c, back = files
         out = ""
         env = {'HG_FILE': fcd.path(),
                'HG_MY_NODE': short(mynode),
                'HG_OTHER_NODE': str(fco.changectx()),
                'HG_BASE_NODE': str(fca.changectx()),
                'HG_MY_ISLINK': 'l' in fcd.flags(),
                'HG_OTHER_ISLINK': 'l' in fco.flags(),
                'HG_BASE_ISLINK': 'l' in fca.flags(),
                }
 
         ui = repo.ui
 
         args = _toolstr(ui, tool, "args", '$local $base $other')
         if "$output" in args:
             out, a = a, back # read input from backup, write to original
         replace = {'local': a, 'base': b, 'other': c, 'output': out}
         args = util.interpolate(r'\$', replace, args,
                                 lambda s: util.shellquote(util.localpath(s)))
         r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env,
                         out=ui.fout)
         return True, r
     return False, 0
 
 def _formatconflictmarker(repo, ctx, template, label, pad):
     """Applies the given template to the ctx, prefixed by the label.
 
     Pad is the minimum width of the label prefix, so that multiple markers
     can have aligned templated parts.
     """
     if ctx.node() is None:
         ctx = ctx.p1()
 
     props = templatekw.keywords.copy()
     props['templ'] = template
     props['ctx'] = ctx
     props['repo'] = repo
     templateresult = template('conflictmarker', **props)
 
     label = ('%s:' % label).ljust(pad + 1)
     mark = '%s %s' % (label, templater.stringify(templateresult))
 
     if mark:
         mark = mark.splitlines()[0] # split for safety
 
     # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
     return util.ellipsis(mark, 80 - 8)
 
 _defaultconflictmarker = ('{node|short} ' +
     '{ifeq(tags, "tip", "", "{tags} ")}' +
     '{if(bookmarks, "{bookmarks} ")}' +
     '{ifeq(branch, "default", "", "{branch} ")}' +
     '- {author|user}: {desc|firstline}')
 
 _defaultconflictlabels = ['local', 'other']
 
 def _formatlabels(repo, fcd, fco, fca, labels):
     """Formats the given labels using the conflict marker template.
 
     Returns a list of formatted labels.
     """
     cd = fcd.changectx()
     co = fco.changectx()
     ca = fca.changectx()
 
     ui = repo.ui
     template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
     template = templater.parsestring(template, quoted=False)
     tmpl = templater.templater(None, cache={'conflictmarker': template})
 
     pad = max(len(l) for l in labels)
 
     newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad),
                  _formatconflictmarker(repo, co, tmpl, labels[1], pad)]
     if len(labels) > 2:
         newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad))
     return newlabels
 
 def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
     """perform a 3-way merge in the working directory
 
     mynode = parent node before merge
     orig = original local filename before merge
     fco = other file context
     fca = ancestor file context
     fcd = local file context for current/destination file
     """
 
     def temp(prefix, ctx):
         pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
         (fd, name) = tempfile.mkstemp(prefix=pre)
         data = repo.wwritedata(ctx.path(), ctx.data())
         f = os.fdopen(fd, "wb")
         f.write(data)
         f.close()
         return name
 
     if not fco.cmp(fcd): # files identical?
         return None
 
     ui = repo.ui
     fd = fcd.path()
     binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
     symlink = 'l' in fcd.flags() + fco.flags()
     tool, toolpath = _picktool(repo, ui, fd, binary, symlink)
     ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
                (tool, fd, binary, symlink))
 
     if tool in internals:
         func = internals[tool]
         trymerge = func.trymerge
         onfailure = func.onfailure
     else:
         func = _xmerge
         trymerge = True
         onfailure = _("merging %s failed!\n")
 
     toolconf = tool, toolpath, binary, symlink
 
     if not trymerge:
         return func(repo, mynode, orig, fcd, fco, fca, toolconf)
 
     a = repo.wjoin(fd)
     b = temp("base", fca)
     c = temp("other", fco)
     back = a + ".orig"
     util.copyfile(a, back)
 
     if orig != fco.path():
         ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
     else:
         ui.status(_("merging %s\n") % fd)
 
     ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
 
     markerstyle = ui.config('ui', 'mergemarkers', 'basic')
     if not labels:
         labels = _defaultconflictlabels
     if markerstyle != 'basic':
         labels = _formatlabels(repo, fcd, fco, fca, labels)
 
     needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
                         (a, b, c, back), labels=labels)
     if not needcheck:
         if r:
             if onfailure:
                 ui.warn(onfailure % fd)
         else:
             util.unlink(back)
 
         util.unlink(b)
         util.unlink(c)
         return r
 
     if not r and (_toolbool(ui, tool, "checkconflicts") or
                   'conflicts' in _toollist(ui, tool, "check")):
         if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(),
                      re.MULTILINE):
             r = 1
 
     checked = False
     if 'prompt' in _toollist(ui, tool, "check"):
         checked = True
         if ui.promptchoice(_("was merge of '%s' successful (yn)?"
                              "$$ &Yes $$ &No") % fd, 1):
             r = 1
 
     if not r and not checked and (_toolbool(ui, tool, "checkchanged") or
                                   'changed' in _toollist(ui, tool, "check")):
         if filecmp.cmp(a, back):
             if ui.promptchoice(_(" output file %s appears unchanged\n"
                                  "was merge successful (yn)?"
                                  "$$ &Yes $$ &No") % fd, 1):
                 r = 1
 
     if _toolbool(ui, tool, "fixeol"):
         _matcheol(a, back)
 
     if r:
         if onfailure:
             ui.warn(onfailure % fd)
     else:
         util.unlink(back)
 
     util.unlink(b)
     util.unlink(c)
     return r
 
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = internals.values()

mercurial/help/merge-tools.txt

@@ -1,85 +1,85 b''
 To merge files Mercurial uses merge tools.
 
 A merge tool combines two different versions of a file into a merged
 file. Merge tools are given the two files and the greatest common
 ancestor of the two file versions, so they can determine the changes
 made on both branches.
 
 Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,
 :hg:`backout` and in several extensions.
 
 Usually, the merge tool tries to automatically reconcile the files by
 combining all non-overlapping changes that occurred separately in
 the two different evolutions of the same initial base file. Furthermore, some
 interactive merge programs make it easier to manually resolve
 conflicting merges, either in a graphical way, or by inserting some
 conflict markers. Mercurial does not include any interactive merge
 programs but relies on external tools for that.
 
 Available merge tools
 =====================
 
 External merge tools and their properties are configured in the
 merge-tools configuration section - see hgrc(5) - but they can often just
 be named by their executable.
 
 A merge tool is generally usable if its executable can be found on the
 system and if it can handle the merge. The executable is found if it
 is an absolute or relative executable path or the name of an
 application in the executable search path. The tool is assumed to be
 able to handle the merge if it can handle symlinks if the file is a
 symlink, if it can handle binary files if the file is binary, and if a
 GUI is available if the tool requires a GUI.
 
 There are some internal merge tools which can be used. The internal
 merge tools are:
 
 .. internaltoolsmarker
 
 Internal tools are always available and do not require a GUI but will by default
 not handle symlinks or binary files.
 
 Choosing a merge tool
 =====================
 
 Mercurial uses these rules when deciding which merge tool to use:
 
 1. If a tool has been specified with the --tool option to merge or resolve, it
    is used.  If it is the name of a tool in the merge-tools configuration, its
    configuration is used. Otherwise the specified tool must be executable by
    the shell.
 
 2. If the ``HGMERGE`` environment variable is present, its value is used and
    must be executable by the shell.
 
 3. If the filename of the file to be merged matches any of the patterns in the
    merge-patterns configuration section, the first usable merge tool
    corresponding to a matching pattern is used. Here, binary capabilities of the
    merge tool are not considered.
 
 4. If ui.merge is set it will be considered next. If the value is not the name
    of a configured tool, the specified value is used and must be executable by
    the shell. Otherwise the named tool is used if it is usable.
 
 5. If any usable merge tools are present in the merge-tools configuration
    section, the one with the highest priority is used.
 
 6. If a program named ``hgmerge`` can be found on the system, it is used - but
    it will by default not be used for symlinks and binary files.
 
 7. If the file to be merged is not binary and is not a symlink, then
-   ``internal:merge`` is used.
+   internal ``:merge`` is used.
 
 8. The merge of the file fails and must be resolved before commit.
 
 .. note::
 
    After selecting a merge program, Mercurial will by default attempt
    to merge the files using a simple merge algorithm first. Only if it doesn't
    succeed because of conflicting changes Mercurial will actually execute the
    merge program. Whether to use the simple merge algorithm first can be
    controlled by the premerge setting of the merge tool. Premerge is enabled by
    default unless the file is binary or a symlink.
 
 See the merge-tools and ui sections of hgrc(5) for details on the
 configuration of merge tools.

tests/test-merge-tools.t

@@ -1,979 +1,979 b''
 test merge-tools configuration - mostly exercising filemerge.py
 
   $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
   $ hg init
 
 revision 0
 
   $ echo "revision 0" > f
   $ echo "space" >> f
   $ hg commit -Am "revision 0"
   adding f
 
 revision 1
 
   $ echo "revision 1" > f
   $ echo "space" >> f
   $ hg commit -Am "revision 1"
   $ hg update 0 > /dev/null
 
 revision 2
 
   $ echo "revision 2" > f
   $ echo "space" >> f
   $ hg commit -Am "revision 2"
   created new head
   $ hg update 0 > /dev/null
 
 revision 3 - simple to merge
 
   $ echo "revision 3" >> f
   $ hg commit -Am "revision 3"
   created new head
 
 revision 4 - hard to merge
 
   $ hg update 0 > /dev/null
   $ echo "revision 4" > f
   $ hg commit -Am "revision 4"
   created new head
 
   $ echo "[merge-tools]" > .hg/hgrc
 
   $ beforemerge() {
   >   cat .hg/hgrc
   >   echo "# hg update -C 1"
   >   hg update -C 1 > /dev/null
   > }
   $ aftermerge() {
   >   echo "# cat f"
   >   cat f
   >   echo "# hg stat"
   >   hg stat
   >   rm -f f.orig
   > }
 
 Tool selection
 
 default is internal merge:
 
   $ beforemerge
   [merge-tools]
   # hg update -C 1
 
 hg merge -r 2
 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
 running from a devel copy, not a temp installation
 
   $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
   merging f
   warning: conflicts during merge.
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   <<<<<<< local: ef83787e2614  - test: revision 1
   revision 1
   =======
   revision 2
   >>>>>>> other: 0185f4e0cf02  - test: revision 2
   space
   # hg stat
   M f
   ? f.orig
 
 simplest hgrc using false for merge:
 
   $ echo "false.whatever=" >> .hg/hgrc
   $ beforemerge
   [merge-tools]
   false.whatever=
   # hg update -C 1
   $ hg merge -r 2
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 unexecutable file in $PATH shouldn't be found:
 
   $ touch false
   $ hg up -qC 1
   $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
   merging f
   warning: conflicts during merge.
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ rm false
 
 executable directory in $PATH shouldn't be found:
 
   $ mkdir false
   $ hg up -qC 1
   $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
   merging f
   warning: conflicts during merge.
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ rmdir false
 
 true with higher .priority gets precedence:
 
   $ echo "true.priority=1" >> .hg/hgrc
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   $ hg merge -r 2
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 unless lowered on command line:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.priority=-7
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 or false set higher on command line:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.false.priority=117
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 or true.executable not found in PATH:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 or true.executable with bogus path:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 but true.executable set to cat found in PATH works:
 
   $ echo "true.executable=cat" >> .hg/hgrc
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2
   merging f
   revision 1
   space
   revision 0
   space
   revision 2
   space
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 and true.executable set to cat with path works:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=cat
   merging f
   revision 1
   space
   revision 0
   space
   revision 2
   space
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 #if unix-permissions
 
 environment variables in true.executable are handled:
 
   $ echo 'echo "custom merge tool"' > .hg/merge.sh
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg --config merge-tools.true.executable='sh' \
   >    --config merge-tools.true.args=.hg/merge.sh \
   >    merge -r 2
   merging f
   custom merge tool
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 #endif
 
 Tool selection and merge-patterns
 
 merge-patterns specifies new tool false:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-patterns.f=false
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 merge-patterns specifies executable not found in PATH and gets warning:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool
   couldn't find merge tool true specified for f
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 merge-patterns specifies executable with bogus path and gets warning:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool
   couldn't find merge tool true specified for f
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 ui.merge overrules priority
 
 ui.merge specifies false:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config ui.merge=false
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 ui.merge specifies internal:fail:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config ui.merge=internal:fail
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 ui.merge specifies :local (without internal prefix):
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config ui.merge=:local
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 ui.merge specifies internal:other:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config ui.merge=internal:other
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 2
   space
   # hg stat
   M f
 
 ui.merge specifies internal:prompt:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config ui.merge=internal:prompt
    no tool found to merge f
   keep (l)ocal or take (o)ther? l
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 ui.merge specifies internal:dump:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config ui.merge=internal:dump
   merging f
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.base
   ? f.local
   ? f.orig
   ? f.other
 
 f.base:
 
   $ cat f.base
   revision 0
   space
 
 f.local:
 
   $ cat f.local
   revision 1
   space
 
 f.other:
 
   $ cat f.other
   revision 2
   space
   $ rm f.base f.local f.other
 
 ui.merge specifies internal:other but is overruled by pattern for false:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 Premerge
 
 ui.merge specifies internal:other but is overruled by --tool=false
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config ui.merge=internal:other --tool=false
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 HGMERGE specifies internal:other but is overruled by --tool=false
 
   $ HGMERGE=internal:other ; export HGMERGE
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --tool=false
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
   $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests
 
 update is a merge ...
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg debugsetparent 0
   $ hg update -r 2
   merging f
   revision 1
   space
   revision 0
   space
   revision 2
   space
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 update should also have --tool
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg debugsetparent 0
   $ hg update -r 2 --tool false
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 Default is silent simplemerge:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 3
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   revision 3
   # hg stat
   M f
 
 .premerge=True is same:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 3 --config merge-tools.true.premerge=True
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   revision 3
   # hg stat
   M f
 
 .premerge=False executes merge-tool:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 3 --config merge-tools.true.premerge=False
   merging f
   revision 1
   space
   revision 0
   space
   revision 0
   space
   revision 3
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 premerge=keep keeps conflict markers in:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 4 --config merge-tools.true.premerge=keep
   merging f
   <<<<<<< local: ef83787e2614  - test: revision 1
   revision 1
   space
   =======
   revision 4
   >>>>>>> other: 81448d39c9a0 - test: revision 4
   revision 0
   space
   revision 4
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   <<<<<<< local: ef83787e2614  - test: revision 1
   revision 1
   space
   =======
   revision 4
   >>>>>>> other: 81448d39c9a0 - test: revision 4
   # hg stat
   M f
 
 premerge=keep-merge3 keeps conflict markers with base content:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3
   merging f
   <<<<<<< local: ef83787e2614  - test: revision 1
   revision 1
   space
   ||||||| base
   revision 0
   space
   =======
   revision 4
   >>>>>>> other: 81448d39c9a0 - test: revision 4
   revision 0
   space
   revision 4
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   <<<<<<< local: ef83787e2614  - test: revision 1
   revision 1
   space
   ||||||| base
   revision 0
   space
   =======
   revision 4
   >>>>>>> other: 81448d39c9a0 - test: revision 4
   # hg stat
   M f
 
 
 Tool execution
 
 set tools.args explicit to include $base $local $other $output:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \
   >   | sed 's,==> .* <==,==> ... <==,g'
   merging f
   ==> ... <==
   revision 0
   space
   
   ==> ... <==
   revision 1
   space
   
   ==> ... <==
   revision 2
   space
   
   ==> ... <==
   revision 1
   space
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
 
 Merge with "echo mergeresult > $local":
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local'
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   mergeresult
   # hg stat
   M f
 
 - and $local is the file f:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f'
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   mergeresult
   # hg stat
   M f
 
 Merge with "echo mergeresult > $output" - the variable is a bit magic:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output'
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   mergeresult
   # hg stat
   M f
 
 Merge using tool with a path that must be quoted:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ cat <<EOF > 'my merge tool'
   > cat "\$1" "\$2" "\$3" > "\$4"
   > EOF
   $ hg --config merge-tools.true.executable='sh' \
   >    --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \
   >    merge -r 2
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ rm -f 'my merge tool'
   $ aftermerge
   # cat f
   revision 0
   space
   revision 1
   space
   revision 2
   space
   # hg stat
   M f
 
 Issue3581: Merging a filename that needs to be quoted
 (This test doesn't work on Windows filesystems even on Linux, so check
 for Unix-like permission)
 
 #if unix-permissions
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ echo "revision 5" > '"; exit 1; echo "'
   $ hg commit -Am "revision 5"
   adding "; exit 1; echo "
   warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "'
   $ hg update -C 1 > /dev/null
   $ echo "revision 6" > '"; exit 1; echo "'
   $ hg commit -Am "revision 6"
   adding "; exit 1; echo "
   warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "'
   created new head
   $ hg merge --config merge-tools.true.executable="true" -r 5
   merging "; exit 1; echo "
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg update -C 1 > /dev/null
 #endif
 
 Merge post-processing
 
 cat is a bad merge-tool and doesn't change:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -y -r 2 --config merge-tools.true.checkchanged=1
   merging f
   revision 1
   space
   revision 0
   space
   revision 2
   space
    output file f appears unchanged
   was merge successful (yn)? n
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
 
 #if symlink
 
 internal merge cannot handle symlinks and shouldn't try:
 
   $ hg update -q -C 1
   $ rm f
   $ ln -s symlink f
   $ hg commit -qm 'f is symlink'
   $ hg merge -r 2 --tool internal:merge
   merging f
-  warning: internal:merge cannot merge symlinks for f
+  warning: internal :merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
 
 #endif

tests/test-merge-types.t

@@ -1,379 +1,379 b''
 #require symlink execbit
 
   $ tellmeabout() {
   > if [ -h $1 ]; then
   >     echo $1 is a symlink:
   >     $TESTDIR/readlink.py $1
   > elif [ -x $1 ]; then
   >     echo $1 is an executable file with content:
   >     cat $1
   > else
   >     echo $1 is a plain file with content:
   >     cat $1
   > fi
   > }
 
   $ hg init test1
   $ cd test1
 
   $ echo a > a
   $ hg ci -Aqmadd
   $ chmod +x a
   $ hg ci -mexecutable
 
   $ hg up -q 0
   $ rm a
   $ ln -s symlink a
   $ hg ci -msymlink
   created new head
 
 Symlink is local parent, executable is other:
 
   $ hg merge --debug
     searching for copies back to rev 1
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
    preserving a for resolve of a
    a: versions differ -> m
   updating: a 1/1 files (100.00%)
   picked tool 'internal:merge' for a (binary False symlink True)
   merging a
   my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da
-  warning: internal:merge cannot merge symlinks for a
+  warning: internal :merge cannot merge symlinks for a
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
 
   $ tellmeabout a
   a is a symlink:
   a -> symlink
   $ hg resolve a --tool internal:other
   (no more unresolved files)
   $ tellmeabout a
   a is an executable file with content:
   a
   $ hg st
   M a
   ? a.orig
 
 Symlink is other parent, executable is local:
 
   $ hg update -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg merge --debug
     searching for copies back to rev 1
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
    preserving a for resolve of a
    a: versions differ -> m
   updating: a 1/1 files (100.00%)
   picked tool 'internal:merge' for a (binary False symlink True)
   merging a
   my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
-  warning: internal:merge cannot merge symlinks for a
+  warning: internal :merge cannot merge symlinks for a
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
 
   $ tellmeabout a
   a is an executable file with content:
   a
 
 Update to link without local change should get us a symlink (issue3316):
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
   ? a.orig
 
 Update to link with local change should cause a merge prompt (issue3200):
 
   $ hg up -Cq 0
   $ echo data > a
   $ HGMERGE= hg up -y --debug
     searching for copies back to rev 2
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
    preserving a for resolve of a
    a: versions differ -> m
   updating: a 1/1 files (100.00%)
   (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
-  picked tool 'internal:prompt' for a (binary False symlink True)
+  picked tool ':prompt' for a (binary False symlink True)
    no tool found to merge a
   keep (l)ocal or take (o)ther? l
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg diff --git
   diff --git a/a b/a
   old mode 120000
   new mode 100644
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -symlink
   \ No newline at end of file
   +data
 
 
 Test only 'l' change - happens rarely, except when recovering from situations
 where that was what happened.
 
   $ hg init test2
   $ cd test2
   $ printf base > f
   $ hg ci -Aqm0
   $ echo file > f
   $ echo content >> f
   $ hg ci -qm1
   $ hg up -qr0
   $ rm f
   $ ln -s base f
   $ hg ci -qm2
   $ hg merge
   merging f
-  warning: internal:merge cannot merge symlinks for f
+  warning: internal :merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ tellmeabout f
   f is a symlink:
   f -> base
 
   $ hg up -Cqr1
   $ hg merge
   merging f
-  warning: internal:merge cannot merge symlinks for f
+  warning: internal :merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ tellmeabout f
   f is a plain file with content:
   file
   content
 
   $ cd ..
 
 Test removed 'x' flag merged with change to symlink
 
   $ hg init test3
   $ cd test3
   $ echo f > f
   $ chmod +x f
   $ hg ci -Aqm0
   $ chmod -x f
   $ hg ci -qm1
   $ hg up -qr0
   $ rm f
   $ ln -s dangling f
   $ hg ci -qm2
   $ hg merge
   merging f
-  warning: internal:merge cannot merge symlinks for f
+  warning: internal :merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ tellmeabout f
   f is a symlink:
   f -> dangling
 
   $ hg up -Cqr1
   $ hg merge
   merging f
-  warning: internal:merge cannot merge symlinks for f
+  warning: internal :merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ tellmeabout f
   f is a plain file with content:
   f
 
 Test removed 'x' flag merged with content change - both ways
 
   $ hg up -Cqr0
   $ echo change > f
   $ hg ci -qm3
   $ hg merge -r1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ tellmeabout f
   f is a plain file with content:
   change
 
   $ hg up -qCr1
   $ hg merge -r3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ tellmeabout f
   f is a plain file with content:
   change
 
   $ cd ..
 
 Test merge with no common ancestor:
 a: just different
 b: x vs -, different (cannot calculate x, cannot ask merge tool)
 c: x vs -, same (cannot calculate x, merge tool is no good)
 d: x vs l, different
 e: x vs l, same
 f: - vs l, different
 g: - vs l, same
 h: l vs l, different
 (where same means the filelog entry is shared and there thus is an ancestor!)
 
   $ hg init test4
   $ cd test4
   $ echo 0 > 0
   $ hg ci -Aqm0
 
   $ echo 1 > a
   $ echo 1 > b
   $ chmod +x b
   $ echo x > c
   $ chmod +x c
   $ echo 1 > d
   $ chmod +x d
   $ printf x > e
   $ chmod +x e
   $ echo 1 > f
   $ printf x > g
   $ ln -s 1 h
   $ hg ci -qAm1
 
   $ hg up -qr0
   $ echo 2 > a
   $ echo 2 > b
   $ echo x > c
   $ ln -s 2 d
   $ ln -s x e
   $ ln -s 2 f
   $ ln -s x g
   $ ln -s 2 h
   $ hg ci -Aqm2
 
   $ hg merge
   merging a
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   warning: cannot merge flags for b
   merging b
   warning: conflicts during merge.
   merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
   warning: cannot merge flags for c
   merging d
-  warning: internal:merge cannot merge symlinks for d
+  warning: internal :merge cannot merge symlinks for d
   merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
   merging f
-  warning: internal:merge cannot merge symlinks for f
+  warning: internal :merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   merging h
-  warning: internal:merge cannot merge symlinks for h
+  warning: internal :merge cannot merge symlinks for h
   merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
   3 files updated, 0 files merged, 0 files removed, 5 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg resolve -l
   U a
   U b
   U d
   U f
   U h
   $ tellmeabout a
   a is a plain file with content:
   <<<<<<< local: 0139c5610547 - test: 2
   2
   =======
   1
   >>>>>>> other: 97e29675e796  - test: 1
   $ tellmeabout b
   b is a plain file with content:
   <<<<<<< local: 0139c5610547 - test: 2
   2
   =======
   1
   >>>>>>> other: 97e29675e796  - test: 1
   $ tellmeabout c
   c is a plain file with content:
   x
   $ tellmeabout d
   d is a symlink:
   d -> 2
   $ tellmeabout e
   e is a symlink:
   e -> x
   $ tellmeabout f
   f is a symlink:
   f -> 2
   $ tellmeabout g
   g is a symlink:
   g -> x
   $ tellmeabout h
   h is a symlink:
   h -> 2
 
   $ hg up -Cqr1
   $ hg merge
   merging a
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   warning: cannot merge flags for b
   merging b
   warning: conflicts during merge.
   merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
   warning: cannot merge flags for c
   merging d
-  warning: internal:merge cannot merge symlinks for d
+  warning: internal :merge cannot merge symlinks for d
   merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
   merging f
-  warning: internal:merge cannot merge symlinks for f
+  warning: internal :merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   merging h
-  warning: internal:merge cannot merge symlinks for h
+  warning: internal :merge cannot merge symlinks for h
   merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
   3 files updated, 0 files merged, 0 files removed, 5 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ tellmeabout a
   a is a plain file with content:
   <<<<<<< local: 97e29675e796  - test: 1
   1
   =======
   2
   >>>>>>> other: 0139c5610547 - test: 2
   $ tellmeabout b
   b is an executable file with content:
   <<<<<<< local: 97e29675e796  - test: 1
   1
   =======
   2
   >>>>>>> other: 0139c5610547 - test: 2
   $ tellmeabout c
   c is an executable file with content:
   x
   $ tellmeabout d
   d is an executable file with content:
   1
   $ tellmeabout e
   e is an executable file with content:
   x (no-eol)
   $ tellmeabout f
   f is a plain file with content:
   1
   $ tellmeabout g
   g is a plain file with content:
   x (no-eol)
   $ tellmeabout h
   h is a symlink:
   h -> 1
 
   $ cd ..

tests/test-tag.t

@@ -1,606 +1,606 b''
   $ hg init test
   $ cd test
 
   $ echo a > a
   $ hg add a
   $ hg commit -m "test"
   $ hg history
   changeset:   0:acb14030fe0a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
   $ hg tag ' '
   abort: tag names cannot consist entirely of whitespace
   [255]
 
 (this tests also that editor is not invoked, if '--edit' is not
 specified)
 
   $ HGEDITOR=cat hg tag "bleah"
   $ hg history
   changeset:   1:d4f0d2909abc
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added tag bleah for changeset acb14030fe0a
   
   changeset:   0:acb14030fe0a
   tag:         bleah
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
   $ echo foo >> .hgtags
   $ hg tag "bleah2"
   abort: working copy of .hgtags is changed
   (please commit .hgtags manually)
   [255]
 
   $ hg revert .hgtags
   $ hg tag -r 0 x y z y y z
   abort: tag names must be unique
   [255]
   $ hg tag tap nada dot tip
   abort: the name 'tip' is reserved
   [255]
   $ hg tag .
   abort: the name '.' is reserved
   [255]
   $ hg tag null
   abort: the name 'null' is reserved
   [255]
   $ hg tag "bleah"
   abort: tag 'bleah' already exists (use -f to force)
   [255]
   $ hg tag "blecch" "bleah"
   abort: tag 'bleah' already exists (use -f to force)
   [255]
 
   $ hg tag --remove "blecch"
   abort: tag 'blecch' does not exist
   [255]
   $ hg tag --remove "bleah" "blecch" "blough"
   abort: tag 'blecch' does not exist
   [255]
 
   $ hg tag -r 0 "bleah0"
   $ hg tag -l -r 1 "bleah1"
   $ hg tag gack gawk gorp
   $ hg tag -f gack
   $ hg tag --remove gack gorp
 
   $ hg tag "bleah "
   abort: tag 'bleah' already exists (use -f to force)
   [255]
   $ hg tag " bleah"
   abort: tag 'bleah' already exists (use -f to force)
   [255]
   $ hg tag " bleah"
   abort: tag 'bleah' already exists (use -f to force)
   [255]
   $ hg tag -r 0 "  bleahbleah  "
   $ hg tag -r 0 " bleah bleah "
 
   $ cat .hgtags
   acb14030fe0a21b60322c440ad2d20cf7685a376 bleah
   acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0
   336fccc858a4eb69609a291105009e484a6b6b8d gack
   336fccc858a4eb69609a291105009e484a6b6b8d gawk
   336fccc858a4eb69609a291105009e484a6b6b8d gorp
   336fccc858a4eb69609a291105009e484a6b6b8d gack
   799667b6f2d9b957f73fa644a918c2df22bab58f gack
   799667b6f2d9b957f73fa644a918c2df22bab58f gack
   0000000000000000000000000000000000000000 gack
   336fccc858a4eb69609a291105009e484a6b6b8d gorp
   0000000000000000000000000000000000000000 gorp
   acb14030fe0a21b60322c440ad2d20cf7685a376 bleahbleah
   acb14030fe0a21b60322c440ad2d20cf7685a376 bleah bleah
 
   $ cat .hg/localtags
   d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
 
 tagging on a non-head revision
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg tag -l localblah
   $ hg tag "foobar"
   abort: not at a branch head (use -f to force)
   [255]
   $ hg tag -f "foobar"
   $ cat .hgtags
   acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
   $ cat .hg/localtags
   d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
   acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
 
   $ hg tag -l 'xx
   > newline'
   abort: '\n' cannot be used in a name
   [255]
   $ hg tag -l 'xx:xx'
   abort: ':' cannot be used in a name
   [255]
 
 cloning local tags
 
   $ cd ..
   $ hg -R test log -r0:5
   changeset:   0:acb14030fe0a
   tag:         bleah
   tag:         bleah bleah
   tag:         bleah0
   tag:         bleahbleah
   tag:         foobar
   tag:         localblah
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
   changeset:   1:d4f0d2909abc
   tag:         bleah1
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added tag bleah for changeset acb14030fe0a
   
   changeset:   2:336fccc858a4
   tag:         gawk
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added tag bleah0 for changeset acb14030fe0a
   
   changeset:   3:799667b6f2d9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added tag gack, gawk, gorp for changeset 336fccc858a4
   
   changeset:   4:154eeb7c0138
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added tag gack for changeset 799667b6f2d9
   
   changeset:   5:b4bb47aaff09
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Removed tag gack, gorp
   
   $ hg clone -q -rbleah1 test test1
   $ hg -R test1 parents --style=compact
   1[tip]   d4f0d2909abc   1970-01-01 00:00 +0000   test
     Added tag bleah for changeset acb14030fe0a
   
   $ hg clone -q -r5 test#bleah1 test2
   $ hg -R test2 parents --style=compact
   5[tip]   b4bb47aaff09   1970-01-01 00:00 +0000   test
     Removed tag gack, gorp
   
   $ hg clone -q -U test#bleah1 test3
   $ hg -R test3 parents --style=compact
 
   $ cd test
 
 Issue601: hg tag doesn't do the right thing if .hgtags or localtags
 doesn't end with EOL
 
   $ python << EOF
   > f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close()
   > f = file('.hg/localtags', 'w'); f.write(last); f.close()
   > EOF
   $ cat .hg/localtags; echo
   acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
   $ hg tag -l localnewline
   $ cat .hg/localtags; echo
   acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
   c2899151f4e76890c602a2597a650a72666681bf localnewline
   
 
   $ python << EOF
   > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close()
   > f = file('.hgtags', 'w'); f.write(last); f.close()
   > EOF
   $ hg ci -m'broken manual edit of .hgtags'
   $ cat .hgtags; echo
   acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
   $ hg tag newline
   $ cat .hgtags; echo
   acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
   a0eea09de1eeec777b46f2085260a373b2fbc293 newline
   
 
 tag and branch using same name
 
   $ hg branch tag-and-branch-same-name
   marked working directory as branch tag-and-branch-same-name
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m"discouraged"
   $ hg tag tag-and-branch-same-name
   warning: tag tag-and-branch-same-name conflicts with existing branch name
 
 test custom commit messages
 
   $ cat > editor.sh << '__EOF__'
   > echo "==== before editing"
   > cat "$1"
   > echo "===="
   > echo "custom tag message" > "$1"
   > echo "second line" >> "$1"
   > __EOF__
 
 at first, test saving last-message.txt
 
 (test that editor is not invoked before transaction starting)
 
   $ cat > .hg/hgrc << '__EOF__'
   > [hooks]
   > # this failure occurs before editor invocation
   > pretag.test-saving-lastmessage = false
   > __EOF__
   $ rm -f .hg/last-message.txt
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e
   abort: pretag.test-saving-lastmessage hook exited with status 1
   [255]
   $ test -f .hg/last-message.txt
   [1]
 
 (test that editor is invoked and commit message is saved into
 "last-message.txt")
 
   $ cat >> .hg/hgrc << '__EOF__'
   > [hooks]
   > pretag.test-saving-lastmessage =
   > # this failure occurs after editor invocation
   > pretxncommit.unexpectedabort = false
   > __EOF__
 
 (this tests also that editor is invoked, if '--edit' is specified,
 regardless of '--message')
 
   $ rm -f .hg/last-message.txt
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e -m "foo bar"
   ==== before editing
   foo bar
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'tag-and-branch-same-name'
   HG: changed .hgtags
   ====
   transaction abort!
   rollback completed
   note: commit message saved in .hg/last-message.txt
   abort: pretxncommit.unexpectedabort hook exited with status 1
   [255]
   $ cat .hg/last-message.txt
   custom tag message
   second line
 
   $ cat >> .hg/hgrc << '__EOF__'
   > [hooks]
   > pretxncommit.unexpectedabort =
   > __EOF__
   $ hg status .hgtags
   M .hgtags
   $ hg revert --no-backup -q .hgtags
 
 then, test custom commit message itself
 
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e
   ==== before editing
   Added tag custom-tag for changeset 75a534207be6
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'tag-and-branch-same-name'
   HG: changed .hgtags
   ====
   $ hg log -l1 --template "{desc}\n"
   custom tag message
   second line
 
 
 local tag with .hgtags modified
 
   $ hg tag hgtags-modified
   $ hg rollback
   repository tip rolled back to revision 13 (undo commit)
   working directory now based on revision 13
   $ hg st
   M .hgtags
   ? .hgtags.orig
   ? editor.sh
   $ hg tag --local baz
   $ hg revert --no-backup .hgtags
 
 
 tagging when at named-branch-head that's not a topo-head
 
   $ hg up default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge -t internal:local
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge named branch'
   $ hg up 13
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tag new-topo-head
 
 tagging on null rev
 
   $ hg up null
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg tag nullrev
   abort: not at a branch head (use -f to force)
   [255]
 
   $ hg init empty
   $ hg tag -R empty nullrev
   abort: cannot tag null revision
   [255]
 
   $ hg tag -R empty -r 00000000000 -f nulltag
   abort: cannot tag null revision
   [255]
 
   $ cd ..
 
 tagging on an uncommitted merge (issue2542)
 
   $ hg init repo-tag-uncommitted-merge
   $ cd repo-tag-uncommitted-merge
   $ echo c1 > f1
   $ hg ci -Am0
   adding f1
   $ echo c2 > f2
   $ hg ci -Am1
   adding f2
   $ hg co -q 0
   $ hg branch b1
   marked working directory as branch b1
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m2
   $ hg up default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge b1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg tag t1
   abort: uncommitted merge
   [255]
   $ hg status
   $ hg tag --rev 1 t2
   abort: uncommitted merge
   [255]
   $ hg tag --rev 1 --local t3
   $ hg tags -v
   tip                                2:2a156e8887cc
   t3                                 1:c3adabd1a5f4 local
 
   $ cd ..
 
 commit hook on tag used to be run without write lock - issue3344
 
   $ hg init repo-tag
   $ touch repo-tag/test
   $ hg -R repo-tag commit -A -m "test"
   adding test
   $ hg init repo-tag-target
   $ hg -R repo-tag --config hooks.commit="\"hg\" push \"`pwd`/repo-tag-target\"" tag tag
   pushing to $TESTTMP/repo-tag-target (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
 
 automatically merge resolvable tag conflicts (i.e. tags that differ in rank)
 create two clones with some different tags as well as some common tags
 check that we can merge tags that differ in rank
 
   $ hg init repo-automatic-tag-merge
   $ cd repo-automatic-tag-merge
   $ echo c0 > f0
   $ hg ci -A -m0
   adding f0
   $ hg tag tbase
   $ cd ..
   $ hg clone repo-automatic-tag-merge repo-automatic-tag-merge-clone
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo-automatic-tag-merge-clone
   $ echo c1 > f1
   $ hg ci -A -m1
   adding f1
   $ hg tag t1 t2 t3
   $ hg tag --remove t2
   $ hg tag t5
   $ echo c2 > f2
   $ hg ci -A -m2
   adding f2
   $ hg tag -f t3
 
   $ cd ../repo-automatic-tag-merge
   $ echo c3 > f3
   $ hg ci -A -m3
   adding f3
   $ hg tag -f t4 t5 t6
   $ hg tag --remove t5
   $ echo c4 > f4
   $ hg ci -A -m4
   adding f4
   $ hg tag t2
   $ hg tag -f t6
 
   $ cd ../repo-automatic-tag-merge-clone
   $ hg pull
   pulling from $TESTTMP/repo-automatic-tag-merge (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 6 changes to 3 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge --tool internal:tagmerge
   merging .hgtags
   2 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg status
   M .hgtags
   M f3
   M f4
   $ hg resolve -l
   R .hgtags
   $ cat .hgtags
   9aa4e1292a27a248f8d07339bed9931d54907be7 t4
   9aa4e1292a27a248f8d07339bed9931d54907be7 t6
   9aa4e1292a27a248f8d07339bed9931d54907be7 t6
   09af2ce14077a94effef208b49a718f4836d4338 t6
   6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1
   929bca7b18d067cbf3844c3896319a940059d748 t2
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
   0000000000000000000000000000000000000000 t2
   875517b4806a848f942811a315a5bce30804ae85 t5
   9aa4e1292a27a248f8d07339bed9931d54907be7 t5
   9aa4e1292a27a248f8d07339bed9931d54907be7 t5
   0000000000000000000000000000000000000000 t5
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
   79505d5360b07e3e79d1052e347e73c02b8afa5b t3
 
 check that the merge tried to minimize the diff witht he first merge parent
 
   $ hg diff --git -r 'p1()' .hgtags
   diff --git a/.hgtags b/.hgtags
   --- a/.hgtags
   +++ b/.hgtags
   @@ -1,9 +1,17 @@
   +9aa4e1292a27a248f8d07339bed9931d54907be7 t4
   +9aa4e1292a27a248f8d07339bed9931d54907be7 t6
   +9aa4e1292a27a248f8d07339bed9931d54907be7 t6
   +09af2ce14077a94effef208b49a718f4836d4338 t6
    6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1
   +929bca7b18d067cbf3844c3896319a940059d748 t2
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
    0000000000000000000000000000000000000000 t2
    875517b4806a848f942811a315a5bce30804ae85 t5
   +9aa4e1292a27a248f8d07339bed9931d54907be7 t5
   +9aa4e1292a27a248f8d07339bed9931d54907be7 t5
   +0000000000000000000000000000000000000000 t5
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
    79505d5360b07e3e79d1052e347e73c02b8afa5b t3
 
 detect merge tag conflicts
 
   $ hg update -C -r tip
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg tag t7
   $ hg update -C -r 'first(sort(head()))'
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ printf "%s %s\n" `hg log -r . --template "{node} t7"` >> .hgtags
   $ hg commit -m "manually add conflicting t7 tag"
   $ hg merge --tool internal:tagmerge
   merging .hgtags
   automatic .hgtags merge failed
   the following 1 tags are in conflict: t7
-  automatic tag merging of .hgtags failed! (use 'hg resolve --tool internal:merge' or another merge tool of your choice)
+  automatic tag merging of .hgtags failed! (use 'hg resolve --tool :merge' or another merge tool of your choice)
   2 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg resolve -l
   U .hgtags
   $ cat .hgtags
   6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
   0000000000000000000000000000000000000000 t2
   875517b4806a848f942811a315a5bce30804ae85 t5
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
   79505d5360b07e3e79d1052e347e73c02b8afa5b t3
   ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7
 
   $ cd ..
 
 handle the loss of tags
 
   $ hg clone repo-automatic-tag-merge-clone repo-merge-lost-tags
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo-merge-lost-tags
   $ echo c5 > f5
   $ hg ci -A -m5
   adding f5
   $ hg tag -f t7
   $ hg update -r 'p1(t7)'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ printf '' > .hgtags
   $ hg commit -m 'delete all tags'
   created new head
   $ hg update -r 'max(t7::)'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge -r tip --tool internal:tagmerge
   merging .hgtags
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg resolve -l
   R .hgtags
   $ cat .hgtags
   6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase
   0000000000000000000000000000000000000000 tbase
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1
   0000000000000000000000000000000000000000 t1
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
   0000000000000000000000000000000000000000 t2
   875517b4806a848f942811a315a5bce30804ae85 t5
   0000000000000000000000000000000000000000 t5
   4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
   79505d5360b07e3e79d1052e347e73c02b8afa5b t3
   0000000000000000000000000000000000000000 t3
   ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7
   0000000000000000000000000000000000000000 t7
   ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7
   fd3a9e394ce3afb354a496323bf68ac1755a30de t7
 
 also check that we minimize the diff with the 1st merge parent
 
   $ hg diff --git -r 'p1()' .hgtags
   diff --git a/.hgtags b/.hgtags
   --- a/.hgtags
   +++ b/.hgtags
   @@ -1,12 +1,17 @@
    6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase
   +0000000000000000000000000000000000000000 tbase
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1
   +0000000000000000000000000000000000000000 t1
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
    0000000000000000000000000000000000000000 t2
    875517b4806a848f942811a315a5bce30804ae85 t5
   +0000000000000000000000000000000000000000 t5
    4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
    79505d5360b07e3e79d1052e347e73c02b8afa5b t3
   +0000000000000000000000000000000000000000 t3
    ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7
   +0000000000000000000000000000000000000000 t7
    ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7
    fd3a9e394ce3afb354a496323bf68ac1755a30de t7