#11120: Autodetect installed 3-way merge programs (invalidates #4434)
------------------------+---------------------------------------------------
Reporter: kini | Owner: tbd
Type: defect | Status: needs_work
Priority: major | Milestone: sage-4.7
Component: packages | Keywords: mercurial, os x
Author: | Upstream: N/A
Reviewer: | Merged:
Work_issues: |
------------------------+---------------------------------------------------
Changes (by dimpase):
* status: needs_review => needs_work
Comment:
Replying to [comment:4 kini]:
{{{
applying trac_11120-re-fix-trac_4434.mercurial-spkg.patch
patching file spkg-install
Hunk #1 succeeded at 37 with fuzz 1 (offset -30 lines).
now at: trac_11120-re-fix-trac_4434.mercurial-spkg.patch
}}}
why do I see fuzz? I'm applying it to the mercurial spkg that comes with
sage- 4.7.alpha3
As well, it seems that your patch either wasn't tested, or was tested
against a diffrent spkg. Indeed, I get:
{{{
...
riting
/usr/local/src/sage/sage-4.7.alpha3/local/lib/python/mercurial-1.6.4-py2.6
.egg-info
cp: contrib/mergetools.rc: No such file or directory
Error installing mergetools.rc
Deleting dead links
...
}}}
at the end of the sage -f mecurial....
indeed, it should be "src/contrib/" rather than just "contrib/" in the
argument of "cp".
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11120#comment:5>
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.
