[Twisted-Python] Question regarding patch submission
![](https://secure.gravatar.com/avatar/39b4b50a0164c9a2ad05c70aea9478c3.jpg?s=120&d=mm&r=g)
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. Thanks! -Jason Litzinger
![](https://secure.gravatar.com/avatar/39b4b50a0164c9a2ad05c70aea9478c3.jpg?s=120&d=mm&r=g)
On Mon, Jun 26, 2017 at 02:23:24PM -0400, Glyph wrote:
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.
Yikes, definitely didn't do that on the PR above, will from now on. If that is preferred, then should step 15 be re-worded to state: "Don't push your changes by rewriting the history, merge trunk into your branch." ? I'm fine making the wiki change, but as these are part of the submission process, seems like at least an ACK or two is in order. -Jason
![](https://secure.gravatar.com/avatar/39b4b50a0164c9a2ad05c70aea9478c3.jpg?s=120&d=mm&r=g)
On Mon, Jun 26, 2017 at 02:23:24PM -0400, Glyph wrote:
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.
Yikes, definitely didn't do that on the PR above, will from now on. If that is preferred, then should step 15 be re-worded to state: "Don't push your changes by rewriting the history, merge trunk into your branch." ? I'm fine making the wiki change, but as these are part of the submission process, seems like at least an ACK or two is in order. -Jason
participants (3)
-
Glyph
-
Jason Litzinger
-
Tristan Seligmann