Re: [sage-devel] Re: Trac again...

[Erik Bray]

On Sat, Jul 9, 2016 at 5:48 PM, Travis Scrimshaw  wrote:
>
>
> On Friday, July 8, 2016 at 3:39:59 AM UTC-5, Jori Mäntysalo wrote:
>>
>> What is wrong with https://trac.sagemath.org/ticket/20980 ?
>>
>> The branch field is red, but I think I did nothing unusual. Also I got an
>> error message about mails not sent when setting it to needs_review.
>>
>>
>
> Also, the automerging on trac has been known to be less permissive than
> local versions of git.

Yep, from what I can tell it doesn't try the same range of merge
strategies that are available to git.

-- 
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 https://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.

Re: [sage-devel] Re: Trac again...

[Dima Pasechnik]

On Friday, July 8, 2016 at 1:30:09 PM UTC+1, Jori Mäntysalo wrote:
>
> On Fri, 8 Jul 2016, Dima Pasechnik wrote: 
>
> > for some reason trac is already on 7.3.beta7 (and with it the automerge 
> fails) 
>
> Now beta7 is released, but the branch is still red. 
>

well, have you hand-merged and pushed the update?
 

>
> And I was not able to push another patch: 
>
>  STDERR: error: failed to push some refs to 
> 'g...@trac.sagemath.org:sage.git' 
>  STDERR: hint: Updates were rejected because a pushed branch tip is 
> behind its remote 
>  STDERR: hint: counterpart. Check out this branch and integrate the 
> remote changes 
>
> -- 
> Jori Mäntysalo 
>

-- 
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 https://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.

Re: [sage-devel] Re: Trac again...

[Jori Mäntysalo]

On Fri, 8 Jul 2016, Dima Pasechnik wrote:


for some reason trac is already on 7.3.beta7 (and with it the automerge fails)


Now beta7 is released, but the branch is still red.

And I was not able to push another patch:

STDERR: error: failed to push some refs to 'g...@trac.sagemath.org:sage.git'
STDERR: hint: Updates were rejected because a pushed branch tip is behind 
its remote
STDERR: hint: counterpart. Check out this branch and integrate the remote 
changes

--
Jori Mäntysalo

Re: [sage-devel] Re: Trac again...

[Dima Pasechnik]

On Friday, July 8, 2016 at 11:21:22 AM UTC+1, Jori Mäntysalo wrote:
>
> On Fri, 8 Jul 2016, Dima Pasechnik wrote: 
>
> >   What is wrong with https://trac.sagemath.org/ticket/20980 ? 
> >   The branch field is red, but I think I did nothing unusual. 
>
> > red branch is meant to indicate that the automatic merge fails. 
> > (i.e. your branch was based off an older version of the file). 
> > However, I double-checked, and it merges just fine. 
>
> Yep, and I have never before seen a branch to instantly go to red. 
>

for some reason trac is already on 7.3.beta7 (and with it the automerge 
fails)

 

>
> >   Also I got an 
> >   error message about mails not sent when setting it to 
> needs_review. 
> > 
> > what was the error message? 
>
> Didn't copy it. Stupid am I. But I think it was some already reported. 
>
> Shortly after that I gave a positive review to #20979, and mail was sent 
> without problems. 
>
> -- 
> Jori Mäntysalo 
>

-- 
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 https://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.

Re: [sage-devel] Re: Trac again...

[Jori Mäntysalo]

On Fri, 8 Jul 2016, Dima Pasechnik wrote:


  What is wrong with https://trac.sagemath.org/ticket/20980 ?
  The branch field is red, but I think I did nothing unusual.



red branch is meant to indicate that the automatic merge fails.
(i.e. your branch was based off an older version of the file).
However, I double-checked, and it merges just fine.


Yep, and I have never before seen a branch to instantly go to red.


  Also I got an
  error message about mails not sent when setting it to needs_review.

what was the error message?


Didn't copy it. Stupid am I. But I think it was some already reported.

Shortly after that I gave a positive review to #20979, and mail was sent 
without problems.


--
Jori Mäntysalo