#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: |
------------------------+---------------------------------------------------
Comment(by kini):
As we talked about in person, I guess the way to test it would be to try
using `sage -hg` to merge files which cannot be automatically merged. I
created [http://sage.math.washington.edu/home/keshav/temp/hgmerge-test/
this minimal example of such a repository and such a file], which you then
pulled and tried out, using `sage -hg` with `$SAGE_ROOT/bin/hgmerge`
removed. This worked just as well as it works on my Linux machine:
{{{
keshav@esterhazy ~/temp/hgmerge-test $ sage -hg log --style=compact
2[tip]:0 212fc073ffa9 2011-04-04 08:10 -0700 kini
Three
1 478fc08a9390 2011-04-04 08:09 -0700 kini
Two
0 a8cccf400996 2011-04-04 08:08 -0700 kini
One
keshav@esterhazy ~/temp/hgmerge-test $ sage -hg merge
merging somefile
warning: conflicts during merge.
merging somefile 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
keshav@esterhazy ~/temp/hgmerge-test $
}}}
Note that this is not really an ''error'' - it's just the lack of a
default merge program being installed. Could it be possible that the
problem that occasioned #4474 is present on Linux as well?
There is actually a sort of "merge tool autodect script" (actually just
some configuration entries making mercurial smarter about where to find a
range of common merging tools) which is provided but not installed by the
upstream distribution of Mercurial, and which lies in the file
`src/contrib/mergetools.rc` within the spkg's root directory. Putting this
in `$SAGE_LOCAL/etc/mercurial/hgrc.d/` should cause merge program problems
to go away. I'll write a patch...
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11120#comment:2>
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.
