Thank you very much, Volker ! I definitely need to take some time to **learn** git.
BTW : the -dev commands currently have no direct documentation *per se*. There is a lot of examples in the developer's guide, and the reference manual has a "SageDev" section, but neither is clear as to what sage functions have a script counterpart, or the possible differences between sage functions and scripts. Le dimanche 22 décembre 2013 14:49:27 UTC+1, Volker Braun a écrit : > > On Sunday, December 22, 2013 9:32:57 AM UTC, Emmanuel Charpentier wrote: >> >> 1) working on another machine, with a brand-new sage tree, I have not >> been able to get my work back : >> sage -dev checkout --ticket 15561 >> > > This does work. See the output of "git log": > > $ git log -4 > commit f570a62601eea75502fa2bab4431643fa1cbc2c7 > Author: Emmanuel Charpentier <emm.cha...@free.fr <javascript:>> > Date: Sat Dec 21 14:53:58 2013 +0100 > > Fixed patching of libpng. > > commit de6e2ee221e49e7ccbcabf731e284b91df9bb919 > Author: Emmanuel Charpentier <emm.cha...@free.fr <javascript:>> > Date: Sat Dec 21 14:30:32 2013 +0100 > > Patching libpng to allow compilation of libfreetype-2.5.2 > > commit 5a4c66b9f9a45ea44e3ac9270311d6f68c05f1ae > Author: Emmanuel Charpentier <emm.cha...@free.fr <javascript:>> > Date: Sat Dec 21 09:39:35 2013 +0100 > > Upgrading to current upstream stable release > Also added license information to the SPKG.txt file. > > commit 3472a854df051b57d1cb7e4934913f17f1fef820 > Author: Volker Braun <vbrau...@gmail.com <javascript:>> > Date: Tue Dec 17 18:08:15 2013 +0000 > > Updated Sage version to 6.0 > > > >> sage -dev diff >> gives me an empty diff. >> > > It shows you the diff relative to the current directory. If you were to > make any (uncommitted) changes, then they would show up here. If you want > to see the diff relative to an older version (say, the "master" branch), > you'd have to do > > sage -dev diff --base master > > Or directly with git: > > git diff master..HEAD # HEAD=current branch head > git diff master.. # abbreviated version > > > -- You received this message because you are subscribed to the Google Groups "sage-support" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-support+unsubscr...@googlegroups.com. To post to this group, send email to sage-support@googlegroups.com. Visit this group at http://groups.google.com/group/sage-support. For more options, visit https://groups.google.com/groups/opt_out.
