[sage-devel] Two beginner questions about patchbot

['Reimundo Heluani' via sage-devel]

Hello, I started today running a patchbot. I wanted to test a couple of very simple patches #29690 and #29691. The latter depends on the former. #29690 passes without problems but #29691 fails tests as if the patch from #29690 were not applied. Now here is were I screwed up. Since #29691 needed #29690, before pushing I had added that change to check that all tests passed. I mistakenly pushed this and then added a commit simply reverting #29690. So now these two branches look like this

     C --- D           (#29691)
    /
---A                  (develop)
    \
     B                (#29690)



--A         /
   \       /
    B ----



Thanks for your time


--
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 view this discussion on the web visit 
https://groups.google.com/d/msgid/sage-devel/20200515211900.GA696691%40vertex.

Commit C has what #29691 is supposed to have plus the same change as B. Commit D simply reverts the change from B. Now if I were to test #29691 I would merge #29690 from that branch which results in C --- D --E / / And then I would merge that branch into develop. But if the patchbot is merging first B into develop and then C+D then B is undone and that's the failure I see. Now my two questions are 1) Is patchbot applying B first and then C + D? I couldn't find anything in patchbot's logfile for #29691 that indicates this, but I suppose it's doing this. 2) What's the right etiquette do deal with this situation? I could simply revert everything since we are talking about trivial patches and noone has pulled them. But still I would want to know the workflow/rules here. R.

signature.asc
Description: PGP signature