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: Tue May 25 17:43:02 2010 -0700
summary: trac 8907 -- build Python with --enabled-shared
2) Robert Bradsure has added a couple of patches.
The top of hg log shows
changeset: 68:81a7be63099e
tag: tip
user: Robert Bradshaw <rober...@math.washington.edu>
date: Tue May 25 01:17:01 2010 -0700
summary: Make sure distutils builtin modules work before trying hashlib.
changeset: 67:9be0b02f70c5
user: Robert Bradshaw <rober...@math.washington.edu>
date: Tue May 25 01:14:41 2010 -0700
summary: The -m64 flag is needed in OPT to build distutils extensions.
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:
changeset: 69:fa717ec5d987
tag: qtip
tag: tip
tag: robert1
user: David Kirkby <david.kir...@onetel.net>
date: Sun May 30 21:52:38 2010 +0100
summary: imported patch robert1
changeset: 68:43988d8b9ab2
tag: qbase
tag: robert2
user: David Kirkby <david.kir...@onetel.net>
date: Sun May 30 21:52:32 2010 +0100
summary: imported patch robert2
changeset: 67:52d34138aa79
tag: qparent
user: mhan...@gmail.com
date: Tue May 25 17:43:02 2010 -0700
summary: trac 8907 -- build Python with --enabled-shared
in other words, Robert's patches appear to be mine, not his. Robert's two
summaries
* Make sure distutils builtin modules work before trying hashlib.
* The -m64 flag is needed in OPT to build distutils extensions.
are lost.
How can I import Roberts patches to what changes Mike has made, whilst keeping
all the information there? The actual code changes are taking place ok, but the
comments, dates and user are not.
PS - I'd prefer instructions which make use of 'hg' not the the mercurial bits
of Sage. (For a start, Sage will not build on the system I'm trying this on).
Dave
--
To post to this group, send an email to sage-devel@googlegroups.com
To unsubscribe from this group, send an email to
sage-devel+unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/sage-devel
URL: http://www.sagemath.org
