#11120: Re-fix #4434 (merging broken on OS X) using MergeToolConfiguration in
Mercurial 1.x
------------------------+---------------------------------------------------
Reporter: kini | Owner: tbd
Type: defect | Status: new
Priority: major | Milestone: sage-4.7
Component: packages | Keywords: mercurial, os x
Author: | Upstream: N/A
Reviewer: | Merged:
Work_issues: |
------------------------+---------------------------------------------------
#4434 should be backed out and fixed (if even still necessary) in a more
modern fashion. In the newer versions of Mercurial currently shipped with
sage, hgmerge is obsolete (and in fact has been since 1.0, which might
explain why no script at all was being copied over, as mentioned in the
description of #4434). It's not a good idea to rely on outdated
functionality.
See http://mercurial.selenic.com/wiki/hgmerge :
>Before Mercurial 1.0, a script named hgmerge was installed by default. As
of Mercurial 1.0, hgmerge is no longer installed (and it should not be
distributed with Mercurial), but hg still uses it, if it's present on the
system and no other merge tools are configured. See
[http://mercurial.selenic.com/wiki/MergeToolConfiguration
MergeToolConfiguration] for the new mechanism.
Hopefully removing this hgmerge file will simply work on OS X - otherwise,
a solution should be made using hgrc as described at
[http://mercurial.selenic.com/wiki/MergeToolConfiguration
MergeToolConfiguration].
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11120>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
