Thanks for the comments, and David's reassurance. I have marked the ticket as ready for review.
John On 13 January 2014 12:20, David Roe <roed.m...@gmail.com> wrote: > > > > On Mon, Jan 13, 2014 at 5:10 AM, John Cremona <john.crem...@gmail.com> > wrote: >> >> The following surprised me. I wanted to work on ticket #10108 which >> had an old patch (which no longer applies). Here is what I did: >> >> 1. I made sure that I was on the develop branch which was up-to-date. >> 2. I did >> sage -dev checkout --ticket=10108 >> which worked fine, putting me into a new branch called ticket/10108 >> 3. I made the changes I wanted, to just one file which had not been >> touched for a long time, namely sage/interfaces/mwrank.py. While >> testing I noticed that the version number being shown was 6.0.rc1. >> 4. I finished my testing and made ac ommit which I uploaded to that >> ticket where it sits as a branch called u/cremona/ticket/10108. BUT >> the parent commits (as shown on that ticket or using git log) are very >> much older than I was expecting, i.e. 6.0.rc1 and not 6.1.beta?, the >> current development branch. >> >> Is this a problem with the dev script, or should have done anything >> differently. Obviously I know that I could have manually made a new >> branch deom the current develop branch and pushed that to trac, but >> the dev scripts are there and should work, so I will not apologise for >> using them! > > > I think the problem is that the dev scripts are, by default, basing off the > "master" branch, which points to the most recent stable release. They > should instead base off the develop branch by default. > >> >> >> Meanwhile should I >> >> (1) Do nothing, but mark the ticket as ready for review; >> (2) Make a new commit whose parent is the current develop branch and >> upload that to trac first; presumably this would count as a rebase, >> though it is hardly rewriting history in any reasonable sense; >> (3) Something else? > > > Your branch merges successfully against develop (the link on trac is green), > so you don't need to do anything. Ready for review! > David >> >> >> John >> >> -- >> You received this message because you are subscribed to the Google Groups >> "sage-devel" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to sage-devel+unsubscr...@googlegroups.com. >> To post to this group, send email to sage-devel@googlegroups.com. >> Visit this group at http://groups.google.com/group/sage-devel. >> For more options, visit https://groups.google.com/groups/opt_out. > > > -- > You received this message because you are subscribed to the Google Groups > "sage-devel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sage-devel+unsubscr...@googlegroups.com. > To post to this group, send email to sage-devel@googlegroups.com. > Visit this group at http://groups.google.com/group/sage-devel. > For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/groups/opt_out.
