[sage-support] Re: Problem with git and trac server

2016-08-21 Thread Volker Braun
I see all commits in the individual commit list, its just red = does not merge cleanly with the current develop branch On Sunday, August 21, 2016 at 11:05:48 PM UTC+2, Paul Mercat wrote: > > In fact nothing is missing in your list of commit. I'm happy to see that. > What is missing is what appea

[sage-support] Re: Problem with git and trac server

2016-08-21 Thread Dima Pasechnik
On Sunday, August 21, 2016 at 10:05:48 PM UTC+1, Paul Mercat wrote: > > In fact nothing is missing in your list of commit. I'm happy to see that. > What is missing is what appear in the ticket #21072 ( > https://trac.sagemath.org/ticket/21072 ) > The two last commits are here but not the two pre

[sage-support] Re: Problem with git and trac server

2016-08-21 Thread 'Paul Mercat' via sage-support
In fact nothing is missing in your list of commit. I'm happy to see that. What is missing is what appear in the ticket #21072 ( https://trac.sagemath.org/ticket/21072 ) The two last commits are here but not the two previous ones. Thanks ! Paul Le dimanche 21 août 2016 22:44:10 UTC+2, Volker Brau

[sage-support] Re: Problem with git and trac server

2016-08-21 Thread Volker Braun
Whats missing (i.e. what is your local "git log")? $ git log --graph trac/u/mercatp/b-adic * commit 7d5ecbece755cb4d2642dc6373573426ba5a4b32 | Author: Paul Mercat | Date: Sun Aug 21 16:02:26 2016 +0200 | | Add function zero_complete2() and zero_inv(). | * commit 15fc3f4a236270fc20f20b18

[sage-support] Re: Problem with git and trac server

2016-08-21 Thread 'Paul Mercat' via sage-support
Thank you for your answer. Unfortunably, your link doesn't work. Of course I've retried to push my changes. It says "Everything up-to-date" but the two commits that I've done before are not in the trac server. Paul Le dimanche 21 août 2016 16:34:21 UTC+2, leif a écrit : > > 'Paul Mercat' via sag

[sage-support] Re: Problem with git and trac server

2016-08-21 Thread leif
'Paul Mercat' via sage-support wrote: > Hi ! > Yesterday or the day before, the trac server was not accessible (or > really really slow). Yesterday Dima installed updates and afterwards rebooted trac.sagemath.org (aka git.sagemath.org). > And when I tried to save my work on the sage code source,