On Sun, Feb 17, 2013 at 02:58:27PM -0800, Andrew Mathas wrote:
Hello!
I'm trying to push patches for #13605-review and #1410[34] but I seem to
have screwed up where hg thinks home is.
I think that what I must have done is somehow got hg to sync with a local
repository rather than with the queue. The reason that I think this might
be the problem is that ``hg log`` returns a list of changesets with the
user being me even though I have nothing so do with the associated
patches.
When Mercurial applies the patches in the queue on your machine, they
are applied under your name. So that should be nothing to worry about.
I have tried ``sage -combinat qselect`` but I am not able to sync because:
sage -hg qpop -a
abort: popping would remove an immutable revision
(see hg help phases for details)
Nothing in the help on phases or on phase helped. Trying ``qpop -f``
doesn't move the queue either.
Does anyone have any ideas as to how I can fix this?
This sounds like you have done something like a commit instead of a
qrefresh in the Sage sources. If that's the case, I am not sure what's
the best way out. Maybe something like backuping your changes as a
patch using a
hg diff -rxxx:yyy my.patch
where xxx and yyy are the revisions in the history before and after
your changes. And then installing a fresh sage combinat queue and
replacing the appropriate patch in the queue by my.patch ...
Good luck!
Nicolas
--
Nicolas M. Thiéry Isil nthi...@users.sf.net
http://Nicolas.Thiery.name/
--
You received this message because you are subscribed to the Google Groups
sage-combinat-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-combinat-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.
