Re: [sage-combinat-devel] NCSF / affine permutation patches

2012-05-21 Thread Franco Saliola
On Mon, May 21, 2012 at 12:46 PM, Chris Berg wrote: > I don't know how to do that... I had been working in Tom's patch by > mistake, but then I went to qrefresh, saw it was his patch, and then > backed up all my changes, hg revert --all, and then went to my own > patch. Was that not how I should d

Re: [sage-combinat-devel] NCSF / affine permutation patches

2012-05-21 Thread Nicolas M. Thiery
Hi Chris! On Mon, May 21, 2012 at 12:46:25PM -0400, Chris Berg wrote: > I don't know how to do that... I had been working in Tom's patch by > mistake, but then I went to qrefresh, saw it was his patch, and then > backed up all my changes, hg revert --all, and then went to my own > patch. W

Re: [sage-combinat-devel] NCSF / affine permutation patches

2012-05-21 Thread Chris Berg
I don't know how to do that... I had been working in Tom's patch by mistake, but then I went to qrefresh, saw it was his patch, and then backed up all my changes, hg revert --all, and then went to my own patch. Was that not how I should do it? Sorry Tom! I backed up all my changes now, Tom if you k

[sage-combinat-devel] NCSF / affine permutation patches

2012-05-21 Thread Nicolas M. Thiery
Hi Chris, Tom, Apparently, NCSF code got accidently qrefreshed in trac_12940_affine_permutations-td.patch, causing the latter to not apply anymore. I temporarily disabled it. Chris, I guess you can simply cut the relevant hunks out of Tom's patch, and check that you already have all the ch