On 2014-01-01, Volker Braun <[email protected]> wrote: > Meant to say: This is not a question about *merge conflicts*, but a > question about your ticket pulling in potentially abandoned code.
... and that's why we surely need a tool to *automatically* pull in the current branch of all dependencies of a ticket. I.a., assume that ticket A used to have commits ca1,ca2, then ticket B builds on top of A and adds a commit cb1. LATER, ticket A adds further commits ca3,ca4 and gets a positive review. Since A is a dependency for B, not only ca1 and ca2 are relevant for B, but ca3 and ca4 are relevant as well. Hence, if we do "sage --dev checkout --ticket=B" (or whatever command there is that uses a direct git-trac interaction) then the script should pull from the current branch of *A* (and all other dependencies of B) and try to merge it into the current branch of B. If it fails then B is clearly not ready for review. Is that what currently happens when doing "sage --dev checkout --ticket=B"? And then, provided that tests pass, I'd say it is perfectly fine that the reviewer for B focuses on commit cb1, even though from the git viewpoint commits ca1,...,ca4 are part of the branch as well. To me, the notion of a "dependency" implies that the above pull-and-merge process is an important step in the reviewing for B. But it is a step that can be automated, and *should* be automated, since otherwise it is too easy to accidentally ommit. In the old hg workflow, getting the latest patches from ticket A was part of the reviewing for B, but it needed to be done manually. If you say that pulling from A and merging into B is supposed to be done manually as well, then why did we switch to git again? 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 [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/groups/opt_out.
