[sage-devel] Re: How do I apply a patch or clean up a repository?

2009-09-02 Thread Stan Schymanski
Sorry, please disregard my previous message. I just found the following plastered all over my terminal window: WARNING: Make sure to create a ~/.hgrc file: -- [ui] username = William Stein wst...@gmail.com

[sage-devel] Re: How do I apply a patch or clean up a repository?

2009-09-01 Thread David Joyner
On Tue, Sep 1, 2009 at 6:03 AM, Stan Schymanskischym...@gmail.com wrote: Dear all, ... I tried different ways of applying a patch with the only success that I probably made a bit of a mess in my repository. Is there a way to revert it back to a clean 4.1.1 install? I'm not sure what you

[sage-devel] Re: How do I apply a patch or clean up a repository?

2009-09-01 Thread Stan Schymanski
Hi David, Thanks for your help. Yes, I did sage -clone myclone, which returned an error message, so I changed back to main (sage -b main), started sage, tried to apply the same patch in main without success and then I thought I should revert to the original by typing hg_sage.revert('--all')

[sage-devel] Re: How do I apply a patch or clean up a repository?

2009-09-01 Thread David Joyner
On Tue, Sep 1, 2009 at 8:03 AM, Stan Schymanskischym...@gmail.com wrote: Hi David, Thanks for your help. Yes, I did sage -clone myclone, which returned an error message, so I changed back to main (sage -b main), started sage, tried to apply the same patch in main without success and then I

[sage-devel] Re: How do I apply a patch or clean up a repository?

2009-09-01 Thread Jason Grout
John Cremona wrote: You may need to recompile from scratch. I would *never* apply a patch to the mai nbranch, for this reason! The reason the hg qimport failed is probably because i nyour .hgrc file you need to alert hg to the fact that you will be using wueues. Mine looks like this:

[sage-devel] Re: How do I apply a patch or clean up a repository?

2009-09-01 Thread Minh Nguyen
Hi Stan, On Tue, Sep 1, 2009 at 10:38 PM, Stan Schymanskischym...@gmail.com wrote: Thanks, John! Is there a simple step-by-step guide to safely applying patches somewhere? Everyone seems to do it differently. I found the following thread helpful, but it would be good to summarise it