Re: State of staging branch?

2016-05-08 Thread David Kastrup
"Phil Holmes" writes: > - Original Message - > From: "David Kastrup" > To: "Phil Holmes" > Cc: > Sent: Sunday, May 08, 2016 3:30 PM > Subject: Re: State of staging branch? > > >> "Phil Holmes"

Re: State of staging branch?

2016-05-08 Thread Phil Holmes
- Original Message - From: "David Kastrup" To: "Phil Holmes" Cc: Sent: Sunday, May 08, 2016 3:30 PM Subject: Re: State of staging branch? "Phil Holmes" writes: Compile was fine and staging pushed to

Re: State of staging branch?

2016-05-08 Thread Jean-Charles Malahieude
Le 08/05/2016 à 16:30, David Kastrup a écrit : "Phil Holmes" writes: Compile was fine and staging pushed to master. I guess James's patchy machine is having connectivity problems or similar. Ok... Just for interest: your system is 64bit? Mine is 32bit and still at

Re: State of staging branch?

2016-05-08 Thread David Kastrup
"Phil Holmes" writes: > Compile was fine and staging pushed to master. I guess James's patchy > machine is having connectivity problems or similar. Ok... Just for interest: your system is 64bit? Mine is 32bit and still at it. I think James' is 64bit. -- David Kastrup

Re: State of staging branch?

2016-05-08 Thread Phil Holmes
- Original Message - From: "David Kastrup" To: "Phil Holmes" Cc: Sent: Sunday, May 08, 2016 2:54 PM Subject: Re: State of staging branch? "Phil Holmes" writes: - Original Message - From:

Re: Doc: Contrib 2.3 Updating git-cl - change source directory (issue 299880043 by gre...@fastmail.co.uk)

2016-05-08 Thread gregrs
On 2016/05/07 11:05:56, Carl wrote: So this patch should be abandoned aND the issue marked invalid, right? Thanks, Carl Yes, correct. I hope I've done this correctly on the issue tracker... https://codereview.appspot.com/299880043/ ___

Re: State of staging branch?

2016-05-08 Thread David Kastrup
"Phil Holmes" writes: > - Original Message - > From: "David Kastrup" > To: > Sent: Sunday, May 08, 2016 2:02 PM > Subject: State of staging branch? > > >> >> Hi all, >> >> since yesterday it would appear that staging is stuck

Re: State of staging branch?

2016-05-08 Thread Phil Holmes
- Original Message - From: "David Kastrup" To: Sent: Sunday, May 08, 2016 2:02 PM Subject: State of staging branch? Hi all, since yesterday it would appear that staging is stuck at a merge with translation: I have my fast machine running.

State of staging branch?

2016-05-08 Thread David Kastrup
Hi all, since yesterday it would appear that staging is stuck at a merge with translation: * commit 237cfd956ed0a705b379513fd861867a9671ce44 (origin/translation, origin/staging) | Author: Jean-Charles Malahieude | AuthorDate: Sat May 7 15:23:53 2016 +0200 | Commit: