As far as I can tell, yes these are being applied to the correct repository. The .hg/patches/series file in the correct devel branch gets the patch added to it and the error looks like it is applying to the correct place.
cd "[edited out]/sage/sage-5.8/devel/sage" && sage --hg qpush applying test.patch patching file sage/schemes/generic/morphism.py Hunk #1 FAILED at 1788 1 out of 1 hunks FAILED -- saving rejects to file sage/schemes/generic/morphism.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh test.patch On Wednesday, May 15, 2013 2:28:33 PM UTC-5, John H Palmieri wrote: > > On Wednesday, May 15, 2013 12:08:57 PM UTC-7, Ben wrote: >> >> I am trying to help someone install patches on their sage and it has gone >> beyond my ability to diagnose. The system is Ubuntu 12.04 with sage 5.8 >> built from source. Mercurial is version 2.0.2. >> >> The behavior is that a patch can be imported into the queue and then >> qpush fails. The patch appears to fail at every hunk. Just to make sure >> this wasn't as issue with the particular patch (which works fine on my 5.8 >> system), I made a simple patch that adds just a single function to >> morphism.py. That patch also failed with the same behavior. The morphism.py >> file on the two systems system are identical and the patch applies on mine >> without issue, so this seems like some kind of configuration problem. >> >> We've tried both hg and sage -hg and checked that the patch file and >> .hgrc are without errors. What else could be going wrong here? >> > > Are you applying the patches to the correct repository? There are several: > one in the top directory "SAGE_ROOT", another in SAGE_ROOT/local/bin, and > (probably the one you want) one in SAGE_ROOT/devel/sage. > > -- > John > > -- You received this message because you are subscribed to the Google Groups "sage-support" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-support?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
