On Tue, Sep 30, 2008 at 11:07 PM, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > > Hi, > > I just tried the merge on sage math, but it still is having problems. > Below is the output with a fresh build and clone of the main > repository. Thanks, > > -Jon > =) > > -------------------------------------------------------------------------------------------------------------------------- > sage [sage-3.1.2]> ./sage -clone special_values > Now cloning the current SAGE library branch... > ... > > sage [sage-3.1.2]> cd devel/sage-special_values/ > sage [sage-special_values]> hg pull > ssh://[EMAIL > PROTECTED]//Users/jonhanke/Documents/sage-2.8.14/devel/sage-special_values > The authenticity of host '128.192.110.15 (128.192.110.15)' can't be > established. > RSA key fingerprint is 6f:be:0c:a6:4a:cb:15:36:75:da:da:33:1f:bb: > 79:cf. > Are you sure you want to continue connecting (yes/no)? yes > Password: > pulling from ssh://[EMAIL > PROTECTED]//Users/jonhanke/Documents/sage-2.8.14/devel/sage-special_values > searching for changes > adding changesets > adding manifests > adding file changes > added 55 changesets with 129 changes to 35 files (+1 heads) > (run 'hg heads' to see heads, 'hg merge' to merge) > remote: Warning: Permanently added '128.192.110.15' (RSA) to the list > of known hosts. > sage [sage-special_values]> hg merge > merging sage/combinat/combinat.py > merging sage/ext/cdefs.pxi > conflicts detected in /home/jonhanke/SAGE_3.1.2_Test/sage-3.1.2/devel/ > sage-special_values/sage/ext/cdefs.pxi > emacs: $(tty): No such file or directory
It's trying to popup an emacs window for you to edit the files and manually do the merges, but for some reason that is failing. Maybe you need to do ssh -Y or set your EDITOR environment variable on sage.math to something like "emacs -nw". William > merge failed > merging sage/ext/cdefs.pxi failed! > merging sage/quadratic_forms/binary_qf.py > conflicts detected in /home/jonhanke/SAGE_3.1.2_Test/sage-3.1.2/devel/ > sage-special_values/sage/quadratic_forms/binary_qf.py > emacs: $(tty): No such file or directory > merge failed > merging sage/quadratic_forms/binary_qf.py failed! > merging sage/quadratic_forms/genera/genus.py > conflicts detected in /home/jonhanke/SAGE_3.1.2_Test/sage-3.1.2/devel/ > sage-special_values/sage/quadratic_forms/genera/genus.py > emacs: $(tty): No such file or directory > merge failed > merging sage/quadratic_forms/genera/genus.py failed! > merging sage/rings/arith.py > conflicts detected in /home/jonhanke/SAGE_3.1.2_Test/sage-3.1.2/devel/ > sage-special_values/sage/rings/arith.py > emacs: $(tty): No such file or directory > merge failed > merging sage/rings/arith.py failed! > merging sage/rings/integer_mod.pxd > merging sage/rings/integer_mod.pyx > merging setup.py > 23 files updated, 4 files merged, 0 files removed, 4 files unresolved > There are unresolved merges, you can redo the full merge using: > hg update -C 10552 > hg merge 10607 > sage [sage-special_values]> > > sage [sage-special_values]> pwd > /home/jonhanke/SAGE_3.1.2_Test/sage-3.1.2/devel/sage-special_values > > -------------------------------------------------------------------- > > > > On Sep 30, 6:25 pm, "William Stein" <[EMAIL PROTECTED]> wrote: >> 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 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 -~----------~----~----~----~------~----~------~--~---
