Dear Andrew--
Your patch trac_13072-tuples-of-partitions_am.patch does not apply against
sage-5.1.rc1 (and presumably for the same reason won't apply against
sage-5.1 either). I have added a guard in the series file so that if
someone is trying to use the combinat queue with sage-5.1.rc1 or later,
your patch won't be applied, but it will be applied as normal for anyone
using sage-5.0.
There is nothing you need to do about this immediately. In particular, for
you, as long as you are using 5.0, what I have done should change nothing.
(Please let me know if it did change anything!)
At some point, you will want to move to sage-5.1 (at the latest, when the
queue stops supporting 5.0), and then, after you have updated to sage-5.1,
you will need to see what there is in your patch which doesn't apply to
sage-5.1.
If this is unclear, or you need further advice about how to proceed, I can
try to help, though I am not an expert, or you can ask one of the actual
experts.
cheers,
Hugh
On Sunday, July 8, 2012 6:49:57 AM UTC+3, Nicolas M. Thiery wrote:
>
> Hi Andrew,
>
> I reinstated the queue to its previous sane state. This means that your
> patches are not there anymore. At this point, you want to reinstall
> the sage-combinat patches anew, and then reimport your patches. If you
> don't have a copy under hand, you can grab them from the dead branch:
>
> http://combinat.sagemath.org/patches/file/da02b569f34b
>
> To reimport them, you can then do from the sage-combinat directory:
>
> sage -hg qimport /...-am.patch
> sage -hg qpush
>
> And then follow the usual update/commit/push cycle.
>
>
> I am a bit puzzled about what went wrong. Everything should be back to
> normal now, so it's no big deal, but let's investigate a bit to learn
> from it and see if we need to update the instructions on the wiki, or
> if it was just a one-time issue. A couple questions:
>
> - What version of Sage are/were you using?
> - When did you last update the sage-combinat queue before merging?
> - Do you have by any chances a trace of the messages from mercurial?
>
> Thanks!
>
> Cheers,
> Nicolas
> --
> Nicolas M. Thi�ry "Isil"
> http://Nicolas.Thiery.name/
>
--
You received this message because you are subscribed to the Google Groups
"sage-combinat-devel" group.
To view this discussion on the web visit
https://groups.google.com/d/msg/sage-combinat-devel/-/kdKt7xH9E2MJ.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
To unsubscribe from this group, send email to
sage-combinat-devel+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/sage-combinat-devel?hl=en.
