On 17 December 2013 15:40, Volker Braun <[email protected]> wrote: > On Tuesday, December 17, 2013 3:32:58 PM UTC, John Cremona wrote: >> >> OK. I guess an alternative would be to use git rebase to rebase the >> ticket branch onto the current master branch; then upload that to the >> ticket, whcih would make it easier for others to look at it (until >> master changes again, of course). But pehaps it should be the ticket >> author, rather than the reviewer, who does any rebasing. > > > Don't rebase branches that are out in the open, that is, attached to trac > tickets for everybody to see. Somebody might have branched off from there > already, and by rebasing (rewriting history) you would invalidate their > branch.
That is a good point. But what a pity. It might make it impossible for a branch to be properly tested and given a positive review! It is not enough for me to be happy with new code and test that it works on top of some months-old version of master, surely a positive review could only be given to something which could be merged with the current master, just as in the old system a patch could only get a positive review if it applied to the current Sage version? It is rather tempting to say, instead, to anyone basing work on a branch which is still in a experimental state, that it is the second brancher's responsibility to ensure that their work is consistent with merged branches. Isn't anything else going to completely stifle development? How can I continue to work on a branch after pushing it to a trac ticket, if I am not allowed to make changes that might affect anyone who has branched off of that? John > > > -- > You received this message because you are subscribed to the Google Groups > "sage-git" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups "sage-git" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
