On Tue, Aug 30, 2011 at 10:03:08PM -0700, Anne Schilling wrote:
Since you asked me to move some code from the Weyl group category to the
affine
Weyl group category, there is now a conflict with the patch
categories-root_system-6588.patch
patching file sage/combinat/free_module.py
Hunk #1
On Wed, Aug 31, 2011 at 10:11:03AM +0200, Nicolas M. Thiery wrote:
I rebased categories-root_system-6588.patch.
Ouch, there was another with patches touching weyl groups which
silently applied wrongly. This should be fixed and pushed now.
Cheers,
Nicolas
--
Hi Anne, Christian,
On Sun, Aug 28, 2011 at 06:38:21PM -0700, Christian Stump wrote:
Done. There were actually several conflicts all over (mostly in my
patches though). And there was also a problem with weyl_groups, that
ElementMethods and the lazy import Finite where not ordered
But it still does not work due to an import loop also in #10963 (which
I couldn't disable as that would have created more conflicts...)
Which import loop? :-)
:-)
It is actually already fixed by the review of the cores patch I did
this morning. In the WeylGroups category, I moved an import
Hi Nicolas,
Since you asked me to move some code from the Weyl group category to the affine
Weyl group category, there is now a conflict with the patch
categories-root_system-6588.patch
patching file sage/combinat/free_module.py
Hunk #1 succeeded at 1087 with fuzz 1 (offset 223 lines).