On a git ticket, click on the name of the branch (which should be green if it applies cleanly) and you'll get a diff of the changes that would occur if the ticket were merged into the current development branch. This view won't be affected by the kind of rebases that you mention.
I will be in Baltimore and could give an informal talk on Sage development using git if there was interest. David On Thu, Jan 9, 2014 at 5:52 AM, William Stein <wst...@gmail.com> wrote: > On Thu, Jan 9, 2014 at 7:50 AM, kcrisman <kcris...@gmail.com> wrote: > >> > >> I've positively reviewed 6f247f6e7f3f704d30f12af082d3e8a4c2120227, which > >> was placed on top of 6.1.beta3. But the current branch is placed on top > of > >> 6.1.beta4, so I get all those tickets too in my diff! How do I do this? > >> Should Nathann have done his "rebase" merges at all, or are those bad > >> practice? Am I even asking the right questions? > > > > > > I just want to mention that I have been pretty reluctant to move to the > new > > flow (and hence start reviewing tickets again) because I can't figure out > > how to interpret all this either. One huge advantage of the "patch" > system > > is that it was very clear what the changes were that were specific to > that > > ticket. (The highlighting/coloration on the patches on Trac was also > easier > > to read, but I don't know if that is as easily fixable.) > > > > So... when is that massive Sage days where everyone was going to be > > introduced to Git with step-by-step presentations and side-by-side help? > > I think it was earlier this week... > > > Supposedly that was to happen *before* 6.0 ;-) Maybe I'll get a > tutorial in > > Baltimore! > > I'm not aware of anybody who will be in Baltimore who is very > knowledgable about the new workflow. > > William > > > > > - kcrisman > > > > -- > > 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. > > > > -- > William Stein > Professor of Mathematics > University of Washington > http://wstein.org > > -- > 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.
