Problem with git and trac server

[Paul Mercat]

Hi !

Yesterday or the day before, the trac server was not accessible (or really really slow).

And when I tried to save my work on the sage code source,

using the command "git push trac HEAD:u/mercatp/b-adic",

it failed. And after that, git tells me that everything is up-to-date,

but in fact the two commits that I tried to push when the trac server was not responsive doesn't appear to be on the trac server.

How can I correct this problem ?

Paul

[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,
> using the command "git push trac HEAD:u/mercatp/b-adic",
> it failed. And after that, git tells me that everything is up-to-date,
> but in fact the two commits that I tried to push when the trac server
> was not responsive doesn't appear to be on the trac server.
> How can I correct this problem ?

See the following thread on sage-devel:

http://permalink.gmane.org/gmane.comp.mathematics.sage.devel/88529


So I think you can simply retry pushing your changes.


-leif

[Paul Mercat]

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

[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 <mer...@yahoo.fr>

| Date:   Sun Aug 21 16:02:26 2016 +0200

| 

|     Add function zero_complete2() and zero_inv().

|  

* commit 15fc3f4a236270fc20f20b18a771479ce6ac4e8d

| Author: Paul Mercat <mer...@yahoo.fr>

| Date:   Sat Aug 20 22:21:31 2016 +0200

| 

|     Correct compute_morceaux2() and equals_langages(), and improve little things.

|  

* commit 1193353456f5853ba9c7bca9fe11fc6658389dc7

| Author: Paul Mercat <mer...@yahoo.fr>

| Date:   Sat Aug 20 17:57:42 2016 +0200

| 

|     Add a function Approx() to BetaAdicMonoid that gives an FastAutomaton describing a set that approximate a shape given by its characteristic function.

|  

* commit d5698d8b7a2bf97cbab6e15fabc4af439aec4adc

| Author: Paul Mercat <mer...@yahoo.fr>

| Date:   Sat Aug 20 17:27:40 2016 +0200

| 

|     Add function compute_translations2() (much more efficient, but have to be debugged) and add a class ImageIn that permit to test if a point is in an image. Correct a lot of little things.

|  

* commit 9bbf3e2730bd705860786a7a33d484b7cd87a8e5

| Author: Paul Mercat <mer...@yahoo.fr>

| Date:   Mon Aug 15 15:45:55 2016 +0200

| 

|     Add a function that compute differently a list of translations for the pieces exchange, and correct some little things.

|  

* commit f06b392336352cca8f825f81dc8646bc361d24d2

| Author: Paul Mercat <mer...@yahoo.fr>

| Date:   Sun Aug 14 11:31:15 2016 +0200

| 

|     Correct little things.

[Paul Mercat]

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

[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 previous ones.

 

well, it's known that the viewer of git tree/commits in trac is buggy. We know few other tickets where it shows

rubbish (compared to what one has in git repo).

[Volker Braun]

I see all commits in the individual commit list, its just red = does not merge cleanly with the current develop branch