[sage-devel] Mercurial in "Sage developers's guide (Release 7.4)"

2016-10-24 Thread Thierry Dumont
There remain some references to Mercurial in the developer's guide: -page 114: "Overview of Patching SPKGS:" ..., use Mercurial to checck... -page 115, -near top: The Mercurial configuration file ... -in the last paragraph: ... use Mercurial... hg tag... t.d. -- You

[sage-devel] Mercurial refuses to access to combinat.sagemath.org

2013-04-09 Thread Florent Hivert
Dear All, I'm stuck on the following agravating problem: hg refuses to connect to combinat: popcorn-*oved/.hg/patches $ hg --debug pull -u using http://combinat.sagemath.org/patches/ sending capabilities command abort: error: Connection reset by peer or popcorn-/tmp $ hg --debug clone htt

[sage-devel] mercurial question

2010-11-13 Thread John Cremona
This is more a Mercurial question than a Sage one. I have two branches of an hg repository: two separate clones, each with different sets of edits, in both case all committed. In branch1 there are several files added and deleted (forgotten). In branch2 there are no changes relevant to those file

Re: [sage-devel] Mercurial - merging patch while keeping owner

2010-05-31 Thread Robert Bradshaw
On May 31, 2010, at 12:52 PM, Dr. David Kirkby wrote: On 05/31/10 05:51 PM, Robert Bradshaw wrote: On May 30, 2010, at 2:27 PM, Dr. David Kirkby wrote: On 05/30/10 10:10 PM, Mike Hansen wrote: On Sun, May 30, 2010 at 2:04 PM, Dr. David Kirkby wrote: 3) I want to add some patches. I've sav

Re: [sage-devel] Mercurial - merging patch while keeping owner

2010-05-31 Thread Dr. David Kirkby
On 05/31/10 05:51 PM, Robert Bradshaw wrote: On May 30, 2010, at 2:27 PM, Dr. David Kirkby wrote: On 05/30/10 10:10 PM, Mike Hansen wrote: On Sun, May 30, 2010 at 2:04 PM, Dr. David Kirkby wrote: 3) I want to add some patches. I've saved Robert's changes to files /tmp/robert1 and /tmp/rober

Re: [sage-devel] Mercurial - merging patch while keeping owner

2010-05-31 Thread Robert Bradshaw
On May 30, 2010, at 2:27 PM, Dr. David Kirkby wrote: On 05/30/10 10:10 PM, Mike Hansen wrote: On Sun, May 30, 2010 at 2:04 PM, Dr. David Kirkby wrote: 3) I want to add some patches. I've saved Robert's changes to files /tmp/robert1 and /tmp/ robert2, but when I import them, hg log shows:

Re: [sage-devel] Mercurial - merging patch while keeping owner

2010-05-30 Thread Dr. David Kirkby
On 05/30/10 10:10 PM, Mike Hansen wrote: On Sun, May 30, 2010 at 2:04 PM, Dr. David Kirkby wrote: 3) I want to add some patches. I've saved Robert's changes to files /tmp/robert1 and /tmp/robert2, but when I import them, hg log shows: How did you save the changes? You should do "hg export

Re: [sage-devel] Mercurial - merging patch while keeping owner

2010-05-30 Thread Mike Hansen
On Sun, May 30, 2010 at 2:04 PM, Dr. David Kirkby wrote: > 3) I want to add some patches. > > I've saved Robert's changes to files /tmp/robert1 and /tmp/robert2, but when > I import them, hg log shows: How did you save the changes? You should do "hg export 9be0b02f70c5 > /tmp/robert1" to get the

[sage-devel] Mercurial - merging patch while keeping owner

2010-05-30 Thread Dr. David Kirkby
I'm trying to incorporate some changes into the python.spkg, which is complicated by the fact that 1) Mike Hansen has updated it to version python-2.6.4.p8 in sage-4.4.3.alpha0 The top of 'hg log' shows changeset: 67:52d34138aa79 tag: qparent user:mhan...@gmail.com date:

Re: [sage-devel] Mercurial - add configure and configure.in ???

2010-02-28 Thread Minh Nguyen
Hi David, On Mon, Mar 1, 2010 at 2:50 AM, Dr. David Kirkby wrote: > Do the auto generated files need to be checked in? I think so. The cddlib package checks in autogenerated files under patches/. -- Regards Minh Van Nguyen -- To post to this group, send an email to sage-devel@googlegroups

[sage-devel] Mercurial - add configure and configure.in ???

2010-02-28 Thread Dr. David Kirkby
I've had to create a patch for Solaris to python. http://trac.sagemath.org/sage_trac/ticket/7867 The changes consist of applying a small (< 1 KB) patch downloaded from the python web site to configure.in, then remaking the configure script. Python's configure.in is quite large (107 KB) and th

Re: [sage-devel] mercurial on t2

2010-02-21 Thread Dr. David Kirkby
Alex Ghitza wrote: On Sun, 21 Feb 2010 19:51:34 +1100, Minh Nguyen wrote: Hi Alex, Did you get a message like this when you do "./sage"? [snippety snip] ImportError: ld.so.1: python: fatal: relocation error: file /scratch/mvngu/sage-4.3.0.1/local/lib//libgmpxx.so.3: symbol _ZNKSt5ctypeIcE1

Re: [sage-devel] mercurial on t2

2010-02-21 Thread Alex Ghitza
On Sun, 21 Feb 2010 19:51:34 +1100, Minh Nguyen wrote: > Hi Alex, > > > Did you get a message like this when you do "./sage"? > [snippety snip] > > ImportError: ld.so.1: python: fatal: relocation error: file > /scratch/mvngu/sage-4.3.0.1/local/lib//libgmpxx.so.3: symbol > _ZNKSt5ctypeIcE13_M_w

Re: [sage-devel] mercurial on t2

2010-02-21 Thread Minh Nguyen
Hi Alex, On Sun, Feb 21, 2010 at 4:16 PM, Alex Ghitza wrote: > I could not use the binary > posted by Minh Did you get a message like this when you do "./sage"? mv...@t2 sage-4.3.0.1]$ ./sage -- | Sage Version 4.3.0.1, Relea

[sage-devel] mercurial on t2

2010-02-20 Thread Alex Ghitza
Hi, This question is probably addressed to David Kirkby and Minh Van Nguyen, but I'm posting it here so others may profit. I'm trying my best to be a good citizen and test a new spkg and some patches on Solaris, more precisely on t2. I could not use the binary posted by Minh so I downloaded the

[sage-devel] mercurial

2009-01-13 Thread Nicolas M. Thiery
Hi, What's the plan for upgrading the version of mercurial distributed with sage? 1.0.2 fixes a bug which readily crashed my sage-combinat patch repository twice (namely: don't qrename a new patch in your queue before committing it!)? As a temporary alternative, do you foresee any proble

[sage-devel] mercurial-howto.txt

2008-10-15 Thread Ralf Hemmecke
I have just downloaded and unpacked http://sage.apcocoa.org/linux/32bit/sage-3.1.2-debian32-intel-i686-Linux.tar.gz The sage binary is now ~/software/lib/sage/sage and ~/software/bin/sage links to this place while ~/software/bin is in my PATH. Then I read ~/software/lib/sage/devel/sage-main/m

[sage-devel] mercurial qrecord

2008-04-04 Thread Ondrej Certik
Hi, Jason has pointed out the new qrecord command in Mercurial. It was actually implemented by Kirill Smelkov, a SymPy developer (and a former darcs user), here you can find Kirill's tutorial: http://docs.sympy.org/sympy-patches-tutorial.html where he describes how he works with Mercurial and q

[sage-devel] mercurial --> plain text --> mercurial

2008-03-26 Thread William Stein
Hi Jason (or anybody), Does anybody have a clue if it is possible to take a directory (e.g., devel/sage/) with an .hg repo directory in it, and do the following: (1) export everything in the .hg repo to something (perhaps a ton of stuff) in plain text format, (2) delete .hg (3) do somethin

[sage-devel] Mercurial Queues

2008-02-14 Thread Jason Grout
As a follow-up to talking about queues at SD7, here are a few things I forgot to mention, for those that are interested: 0. For those interested in more, see http://hgbook.red-bean.com/hgbook.html ( http://hgbook.red-bean.com/ for other formats). 1. treat "hg qrefresh" and "hg qnew" as a comm

[sage-devel] Mercurial Plugin for Trac

2007-09-10 Thread Mike Hansen
Pablo mentioned that it'd be nice to have a Mercurial plugin for Trac. It turns out (a bit unsurprisingly -- there seems to be a plugin for everything for Trac) that there is an experimental one: http://trac.edgewall.org/wiki/TracMercurial I think it'd be a nice feature to have on the Trac serve

[sage-devel] Mercurial Chapter in Progamming Guide

2007-08-20 Thread John Cremona
Chapter 7 in the Progamming Guide, about using Mercurial, only mentions hg_sage but not hg_c_lib,hg_doc, hg_extcode, hg_scripts.I just discovered the existence of hg_extcode as I had been editing some extcode! Now presumably I could rewrite that myself using hg_doc and submit a patch

[sage-devel] mercurial

2007-02-07 Thread David Harvey
I am very annoyed with hg. We have been using it for several months now, but still, pretty much *every* time I use it, I get confused as to what I am doing. It always ends up wasting a lot of my time. The warnings/error messages are unhelpful, and somehow the whole system is very unintuitive t

[sage-devel] Mercurial commit vs. record

2006-11-29 Thread Robert Miller
Can anyone tell me what the real difference is between hg_sage.record and hg_sage.commit? --~--~-~--~~~---~--~~ 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

[sage-devel] Mercurial usage questions...

2006-10-06 Thread Fernando Perez
Hi all, I was trying to use Mercurial to see if I could fix a few problems I'm noticing with the terminal-based SAGE, but I'm having hg-issues. >From what I can see, and after following the tutorial, the sage -clone fperez command will correctly clone the main repo, and I can then switch with