On Tue, Sep 30, 2008 at 3:21 PM, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > Hi William, > > No diff program appears, thought I know what you mean. I'm running > SAGE 3.1.2 on OS 10.5.5, which I compiled from source. What is the > standard program that should be called? Diff is installed on my > system.
Please keep things on list (thanks). Mercurial *should* be calling FileMerge and popping up a nice graphical filemerge program, which will let you resolve all conflicts. If that doesn't happen, then there is something wrong with your install. Hmm. Could you try instead doing the merge on sage a linux box (e.g., sage.math)? Once you merge in the new code and check in the changes, you can do "hg bundle foo.hg" (or something) and make a bundle of it, then apply that to your os x box, and it will work without having to resolve any conflicts. Cheers, William > > [EMAIL PROTECTED]/Documents/SAGE/sage-3.1.2/devel/sage-special_values]: > which diff > /usr/bin/diff > > Thanks, > > -Jon > =) > > > On Sep 30, 12:40 pm, "William Stein" <[EMAIL PROTECTED]> wrote: >> On Tue, Sep 30, 2008 at 9:11 AM, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: >> >> > Great That's much simpler. =) This clears up the patch forcing, but >> > I still get merge conflict errors when I run 'hg merge'. Is there a >> > nice way resolving these conflicts? Thanks, >> >> You just have to resolve them. Doesn't a diff program or something >> pop up? Or is it really just what you see on the command line? >> If the latter, then your install is somehow "broken". Let me know. >> >> --- >> William Stein >> Associate Professor of Mathematics >> University of Washingtonhttp://wstein.org > -- William Stein Associate Professor of Mathematics University of Washington http://wstein.org --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to sage-devel@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
