Hi Volker, On 2014-01-02, Volker Braun <vbraun.n...@gmail.com> wrote: > Checking for problems is the easy part, this is not what I'm talking about. > By *safe*, I mean in a way such that the reviewer, at the time of the > review, is actually seeing all the changes that he is reviewing. > > Whatever proposal you come up with work in the following scenario where > there are three commits A -> B -> C and > * ticket 1: Commit: B > * ticket 2 depends on 1, Commit: C > Now you look *only* at commit C and set ticket 2 to positive review. Then > somebody else changes ticket one to "Commit: A". Finally, ticket 1 is > reviewed. The result is that B is never reviewed but merged into Sage > without either reviewer noticing.
And that's what I have repeatedly named a "git artefact". In the hg workflow (I'd say: in any reasonable trac workflow), B would simply not be merged, since it does not belong to any positively reviewed ticket. But you try to convince us that with git there is no such notion as "ticket to which a commit belongs". And since git is good (that's an axiom) we have to accept that the reviewer of ticket 2 has to review commit A, and we also have to accept that a positive review of ticket 2 should qualify commit A for being merged, even though the reviewer of ticket 1 (who supposedly is more expert for the topic of ticket 1 than the reviewer of ticket 2!!) says that commit A can't be accepted. But it keeps looking wrong to me: In the scenario you describe, commit B clearly belongs to the original version of ticket 1; it does *not* belong to ticket 2 and *not* to the positively reviewed version of ticket 1. And so there is no reason to merge commit B. If git suggests to merge B, then it's a bad flaw, and we need to do something about it: We need to implement a work-around in our workflow. That said, the fact that a dependency for ticket 2 has changed means that ticket 2 needs someone to check that things still work. This has to hold in any workflow. Best regards, Simon -- 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 http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/groups/opt_out.
