#4434: [with patch; needs review] hgmerge massively broken on os x
----------------------+-----------------------------------------------------
Reporter: was | Owner: mabshoff
Type: defect | Status: new
Priority: major | Milestone: sage-3.2
Component: packages | Keywords:
----------------------+-----------------------------------------------------
When doing a graphical 3-way merge under OS X, hgmerge is missing so one
gets infinite loops or errors. This is a major problem.
The spkg here:
http://sage.math.washington.edu/home/was/patches/mercurial-1.01.p2.spkg
does the following:
* Added custom hgmerge script for OS X. For some reason no script at all
was
copied over, which lead to (1) hg merge silently failing painfully for
most
users, and (2) for users that run install_scripts, they would get a
fork
bomb, since hgmerge would call sage -hgmerge which would call hgmerge
ad infintum.
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/4434>
Sage <http://sagemath.org/>
Sage - Open Source Mathematical Software: Building the Car Instead of
Reinventing the Wheel
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
