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
<david.kir...@onetel.net> 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 patch along with the Mercurial info. You
should be able to import this with all of the metadata. If you do
"hg
qrefresh" on any of these patches (say to change a date or so),
then
the metadata will stay the same.
--Mike
Thanks mike. I think I used just the '67' from the changeset
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.
and not the 'be0b02f70c5' bit. I must admit, I could be wrong. But
it
seems to have worked now doing what you say.
Another option, perhaps more natural from the distributed revision
control perspective, would be to just pull the changes in from one
repository to the other and merge. E.g.
cd /new/repo
hg pull /old/repo
Would that bring in all the changes from oldrepo? If so, it sounds a
quicker way to do what I wanted.
Yep, that's what the command is for.
hg merge
hg commit
Queues are nice too though, especially for "pulling" stuff from trac.
- Robert
I need to get to know Mercurial better, though I must admit, I often
wished we used a central server so one did not have to keep rebasing
packages. It gets a bit tedious.
We do have http://hg.sagemath.org/ , but that only gets updated at
release. It'd be nice to serve the alphas up there too (at least,
maybe even more fine grained) and also the spkg repositories.
- Robert
--
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
