What is the point of doing git fetch followed by git pull ? Note that with git fetch (or git pull) you download *all* the remote branches on the trac server while you seemed only interested to pull the develop branch. You should have done
git pull trac develop where trac is the name you choose for the remote git server at trac.sagemath.org. You should really learn git before using it ;-) See http://git-scm.com/book/en/v2 Vincent 2014-11-05 12:06 UTC−06:00, Emmanuel Charpentier <emanuel.charpent...@gmail.com>: > Trying to update a sage tree (currently at 6.4rc0) : > charpent@SAP5057241:/usr/local/sage-6.4$ git status > Sur la branche develop > Votre branche est à jour avec 'trac/develop'. > rien à valider, la copie de travail est propre > charpent@SAP5057241:/usr/local/sage-6.4$ git fetch > remote: Counting objects: 2372, done. > remote: Compressing objects: 100% (1207/1207), done. > remote: Total 1653 (delta 1320), reused 563 (delta 432) > Réception d'objets: 100% (1653/1653), 422.75 KiB | 433.00 KiB/s, fait. > Résolution des deltas: 100% (1320/1320), complété avec 226 objets locaux. > [ Lots of branch publications ... ] > * [nouvelle branche] u/vinceknight/finishedresponsetobigreview -> > trac/u/vinceknight/finishedresponsetobigreview > * [nouvelle étiquette] 6.4.rc1 -> 6.4.rc1 > charpent@SAP5057241:/usr/local/sage-6.4$ git status > Sur la branche develop > Votre branche est en retard sur 'trac/develop' de 43 commits, et peut être > mise à jour en avance rapide. > (utilisez "git pull" pour mettre à jour votre branche locale) > rien à valider, la copie de travail est propre > charpent@SAP5057241:/usr/local/sage-6.4$ git pull > error: there are still refs under > 'refs/remotes/trac/public/combinat/zabrocki/fixstrongtableaux' > Depuis trac.sagemath.org:sage > ! [nouvelle branche] public/combinat/zabrocki/fixstrongtableaux -> > trac/public/combinat/zabrocki/fixstrongtableaux (impossible de mettre à > jour la référence locale) > [ ??? ] > charpent@SAP5057241:/usr/local/sage-6.4$ git branch > * develop > master > t/16711/752190c8b5dcd7964ddbae59a4f7899100d787be > > I *suppose* that my tree is now *correctly* at RC1, and I'll try to compile > > it (overnight : this is a small and slow machine...). > > Still, it's scary : I can't make sense of the message... > > HTH, > -- > Emmanuel Charpentier > > -- > 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/d/optout. > -- 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/d/optout.
