Re: [sage-combinat-devel] Re: queue broken
Anne Schilling writes: > Hi Martin, > > I rebased your patch. Since Mike and I touched sfa.py quite heavily during the > past week (see also http://trac.sagemath.org/sage_trac/ticket/5457 ), there > was a conflict, which I hope I resolved. Make sure I did not mess anything up. > Your doctests do not pass, but most likely this was already the case before > the rebase! Hm, I checked them very recently... I'll check next week. > I do not think there is support for symmetric functions in several alphabets > yet, > but I could be wrong. OK, Martin -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. 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.
Re: [sage-combinat-devel] Re: queue broken
Hi Travis, Most likely someone touched the partition file during the last week during the Sage Days in a patch further down in the queue, which created the conflict. Please rebase your patch (or move it higher up and contact the people with whom your patch is in conflict in case yours already has a positive review). Best, Anne On 7/14/12 2:18 AM, Travis Scrimshaw wrote: > Mike, >The only thing that has changed in trac_6538 in the past few days is to > combinat/tutorial.py. If you figure out what's wrong, let me know. I won't be > able to push/pull anything for sage in the next > week because of the proxy server I'm having to use and I'll be making my way > to Tokyo. Thanks. > > Anne, >I'm running on 5.0.rc0 but won't be able to reinstall combinat (b/c proxy > server). I'll upgrade once I reach Tokyo (and I believe 5.2 is coming out > shortly too, correct?). > > Best, > Travis > > > On Friday, July 13, 2012 8:12:28 PM UTC+1, Mike Zabrocki wrote: > > Hi, > We are in the last few hours of sage days and I had to disable a few > patches. > I didn't figure what the cause was in these cases, only that they weren't > working > for me now. > We made changes on symmetric functions so I am sure that Martin's > patch is failing to apply at least partly because of that. > > sf_principal_specialization-mr.patch > trac_6538-partitions_max_slope-ts.patch > > I don't know what is failing with Travis' patch. > I'll try to restore them later. > > -Mike > > > On Friday, 13 July 2012 09:14:47 UTC-5, Anne Schilling wrote: > > Hi Travis, > > For me everything applies fine under sage-5.1. Which version of sage > are you using? > You should upgrade to sage-5.1 most likely! > > Anne > > On 7/13/12 4:23 AM, Travis Scrimshaw wrote: > > Hey, > >I'm also getting an error when applying > trac_9265_tableaux_categories_jb.patch. Is this related? > > > > Best, > > Travis > > > > > > On Thursday, July 12, 2012 7:46:15 PM UTC+1, Anne Schilling wrote: > > > > Hi! > > > > The patch queue is currently broken with sage-5.1. > > Nicolas claims that he fixed this before lunch, so Chris, > > did you make changes since that break the queue? > > > > Thanks, > > > > Anne -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. 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.
Re: [sage-combinat-devel] Re: queue broken
Hi Martin, I rebased your patch. Since Mike and I touched sfa.py quite heavily during the past week (see also http://trac.sagemath.org/sage_trac/ticket/5457 ), there was a conflict, which I hope I resolved. Make sure I did not mess anything up. Your doctests do not pass, but most likely this was already the case before the rebase! I do not think there is support for symmetric functions in several alphabets yet, but I could be wrong. Cheers, Anne On 7/14/12 1:31 AM, Martin Rubey wrote: > Dear Mike, > > Mike Zabrocki writes: > >> Hi, >> We are in the last few hours of sage days and I had to disable a few patches. >> I didn't figure what the cause was in these cases, only that they weren't >> working >> for me now. >> We made changes on symmetric functions so I am sure that Martin's >> patch is failing to apply at least partly because of that. > > I am not sure what to do, and honestly, right now I have difficulties to > do anything. Could you simply adapt my patch? > > Quite unrelated: is there (at least some) support for symmetric > functions in several (say, two) alphabets? (In particular plethysm...) > > Martin -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. 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.
[sage-combinat-devel] more guarded patches
Hi Paul-Olivier, Mike Zabrocki and I have done a lot of work on the code in symmetric functions. Currently your patch does not apply any more in the sage-combinat queue. ... applying permutation_groups_stabilizer_chains-rm.patch skipping group_algebras_feature_central_6654_vf.patch - guarded by ['+4_1_2'] applying power-series_commutative_PaulDehaye.patch patching file sage/combinat/sf/sf.py Hunk #1 FAILED at 175 1 out of 1 hunks FAILED -- saving rejects to file sage/combinat/sf/sf.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh power-series_commutative_PaulDehaye.patch I temporarily disabled it. Please rebase it! Thanks, Anne -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. 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.
[sage-combinat-devel] Warning: a few trac tickets touching many files, leading to possible conflicts with the queue
For people working with the combinat queue: - Trac ticket #13255 [1] touches many files, all in the directory devel/sage/sage/misc. - Trac ticket #6495 [2] touches many files, all in devel/sage/doc/, including practically all of the files in devel/sage/doc/en/reference. These patches are still marked as "Needs review", so if your combinat patch also touches files in these directories, you might want to work with the authors of these tickets to try to avoid future conflicts. Also, ticket #13245 turns off docbuilding while doing the clone when installing the combinat queue, so if you want to review that, you will help to speed up the process of installing the queue. Cheers, John [1] http://trac.sagemath.org/sage_trac/ticket/13255 [2] http://trac.sagemath.org/sage_trac/ticket/6495 [3] http://trac.sagemath.org/sage_trac/ticket/13245 -- 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/-/s-wElRyadycJ. 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.
Re: [sage-combinat-devel] Merging issue
Thanks for the detailed work flow Anne. I guess what I was missing is that I only need to merge if hg complains after the push. I'm now back in Sydney and have upgraded to 5.1 So I have a better access to the mailing list and the patch. eI found the following comment in the series file: trac_13072-tuples-of-partitions_am.patch #+disabled: depends on something before; please investigate +5_1_rc1 I thought that the patches were applied incrementally so, in this sense, every patch depends on anything which is earlier in the queue. Am I supposed to just move my patch upwards in the series file until I find somewhere where it no longer applies? There clearly is a problem with my patch because I keeping fixing the conflicts, checking that everything applies, committing etc. Then the next day when I update the queue my patch fails to apply in exactly the same way and I have to fix it again. I this something that I am doing wrong or is my patch being continually thrown out by something else? Perhaps, this dependence on an earlier patch and I have to fix it again causing the problem or my previous use of sage 5.0? Hopefully now that I am using version 5.1 the patch will stick? Sorry that I seem to be struggling with this so much... Andrew On Thursday, 12 July 2012 22:59:21 UTC+8, Anne Schilling wrote: > > Hi Andrew, > > If you did reinstall your sage-combinat, then there should not be any > problem. > Looking at your last commit, it looked to have gone through fine! > > The usual workflow is as follows: > > - update from the queue frequently since there is a lot of flow and you > want to > have the most up to date version > You do that by > sage -combinat update > > - If you are working on a patch you can write it to your patch by > sage -hg qrefresh > > It is usually best to commit after you have pulled from the server to > avoid > merges or conflicts. For this, go to your directory > ../sage-combinat/.hg/patches > and type > sage -hg pull > sage -hg update > > After that you can do > > sage -hg commit > sage -hg push > > In case you committed and people in the meantime have pushed changes to > the server, > you need to merge your changes with theirs. For this do > > sage -hg merge > sage -hg commit > sage -hg push > > I hope this helps, > > Anne > > On 7/12/12 3:19 AM, Andrew Mathas wrote: > > Thanks Anne. Yes, I did a clean install of sage-combinat, but I think I > forgot to to a "hg init", which might have caused my problem?? > > > > I am sure that I am not in the default tip. The question, how do I get > into it? > > > > When I do a commit should I merge using revision number from my patch or > some other number. I didn't want to use revision number from my patch in > case it screwed up the queue again... > > > > Cheers > > Andrew > > > > On 12/07/12 10:11 AM, Anne Schilling wrote: > >> Dear Andrew, > >> > >> Did you delete your sage-combinat folder on your local machine and then > reinstall > >> sage-combinat via > >> > >> sage -combinat install > >> ? > >> > >> Nicolas put a new default tip in the mercurial repository. So if you > are now in the > >> non-default tip, this might explain your problems. > >> > >> Cheers, > >> > >> Anne > >> > >> On 7/11/12 4:35 PM, Andrew Mathas wrote: > >>> Hi All, > >>> > >>> Sorry for breaking the queue last week. I am trying not to break it > again but whenever I push a patch to the server merging returns the error > message > >>> > >>> abort: branch 'default' has one head - please merge with an explicit > rev > >>> > >>> I am not if I am missing something in my commit process and I don't > know where to find the revision number to complete the merge. The log of my > commit is below. > >>> > >>> Could some one please set me straight? I am not able to read > sage-combinat directly at the moment (I'm behind the great firewall of > China), so if you could cc any reply to me directly that would be > >>> appreciated. > >>> > >>> Cheers, > >>> Andrew > >>> > >>> --- > >>> How I am committing: > >>> I am following the instruction on > >>> > wiki.sagemath.org/combinat/MercurialStepByStep#Pushing_patches_to_the_sage-combinat_server > > >>> > >>> After first running > >>> > >>> sage -combinat update -f > >>> sage -hg qpush -a > >>> sage -br > >>> > >>> testing my files and updating again I did the following: > >>> > >>> 730-patches: sage -hg push > >>> pushing to http://combinat.sagemath.org/patches/ > >>> searching for changes > >>> remote: adding changesets > >>> remote: adding manifests > >>> remote: adding file changes > >>> remote: added 1 changesets with 3 changes to 3 files > >>> 731-patches: sage -hg pull -u > >>> pulling from http://combinat.sagemath.org/patches/ > >>> searching for changes > >>> no changes found > >>> 732-patches: sage -hg merge > >>> abort: branch 'default' ha
Re: [sage-combinat-devel] Re: queue broken
Mike, The only thing that has changed in trac_6538 in the past few days is to combinat/tutorial.py. If you figure out what's wrong, let me know. I won't be able to push/pull anything for sage in the next week because of the proxy server I'm having to use and I'll be making my way to Tokyo. Thanks. Anne, I'm running on 5.0.rc0 but won't be able to reinstall combinat (b/c proxy server). I'll upgrade once I reach Tokyo (and I believe 5.2 is coming out shortly too, correct?). Best, Travis On Friday, July 13, 2012 8:12:28 PM UTC+1, Mike Zabrocki wrote: > > Hi, > We are in the last few hours of sage days and I had to disable a few > patches. > I didn't figure what the cause was in these cases, only that they weren't > working > for me now. > We made changes on symmetric functions so I am sure that Martin's > patch is failing to apply at least partly because of that. > > sf_principal_specialization-mr.patch > trac_6538-partitions_max_slope-ts.patch > > I don't know what is failing with Travis' patch. > I'll try to restore them later. > > -Mike > > > On Friday, 13 July 2012 09:14:47 UTC-5, Anne Schilling wrote: >> >> Hi Travis, >> >> For me everything applies fine under sage-5.1. Which version of sage are >> you using? >> You should upgrade to sage-5.1 most likely! >> >> Anne >> >> On 7/13/12 4:23 AM, Travis Scrimshaw wrote: >> > Hey, >> >I'm also getting an error when applying >> trac_9265_tableaux_categories_jb.patch. Is this related? >> > >> > Best, >> > Travis >> > >> > >> > On Thursday, July 12, 2012 7:46:15 PM UTC+1, Anne Schilling wrote: >> > >> > Hi! >> > >> > The patch queue is currently broken with sage-5.1. >> > Nicolas claims that he fixed this before lunch, so Chris, >> > did you make changes since that break the queue? >> > >> > Thanks, >> > >> > Anne >> > >> > -- 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/-/e7RC_KirsLQJ. 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.
Re: [sage-combinat-devel] Re: queue broken
Dear Mike, Mike Zabrocki writes: > Hi, > We are in the last few hours of sage days and I had to disable a few patches. > I didn't figure what the cause was in these cases, only that they weren't > working > for me now. > We made changes on symmetric functions so I am sure that Martin's > patch is failing to apply at least partly because of that. I am not sure what to do, and honestly, right now I have difficulties to do anything. Could you simply adapt my patch? Quite unrelated: is there (at least some) support for symmetric functions in several (say, two) alphabets? (In particular plethysm...) Martin -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. 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.
[sage-combinat-devel] Sage Days 40
Dear All! Thanks again to everyone who participated in the Sage Days 40 this past week in Minneapolis. It was great to meet you all and work with you. I hope everyone got something out of the workshop. Many thanks to Gregg Musiker and IMA for all the local organization, and the NSF for funding! Let's keep in touch on this mailing list about everyone's progress. Best, Anne -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. 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.
