> On Jun 25, 2017, at 11:34 PM, Jason Litzinger <jlitzinger...@gmail.com> wrote: > > Hello, > Quick question regarding #15 of > https://twistedmatrix.com/trac/wiki/TwistedDevelopment#SubmittingaPatch. > > The step indicates that history shouldn't be re-written and the branch > should be rebased over trunk. Pretty straightforward, introduce new commits, > don't mess with the old ones. > > However, after incorporating review comments in new commits and, > force-pushing the feature branch, is it expected that the review comments may > be damaged? > > An example is: > https://github.com/twisted/twisted/pull/793 > > The review comment on May 25 leads to nowhere because that file appeared in > trunk and was dropped when it was rebased. Not the end of the world, but > might > make reviewing the history on subsequent iterations of the PR a little > strange.
The comment about rebasing predates our current process; it was from the days when we were using SVN. Nowadays we usually just merge trunk in to the branch. -g _______________________________________________ Twisted-Python mailing list Twisted-Python@twistedmatrix.com https://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-python
