Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Want to Become a Screener?

Do Screeners are a subset of contributors who are responsible for moving tickets through a review process, and then funneling tickets to the BDFL.

It would be great to have more screeners. If you are interested, just do all the steps described in this document, without actually changing any ticket attributes. Instead, add a comment to the ticket explaining what you would have done to screen it. (Screeners: keep an eye out for such comments, and where sensible provide feedback so that we are grooming more screeners.)

...

Code Block
languagenone
$ git checkout -b freds_fixbug42
$ git am --keep-cr -s --ignore-whitespace < their-patch-file.diff
  • make sure you have a clean local checkout
  • no need to check on multiple OSes (unless the ticket is specific to this)
  • Please If you are committing i.e. you own the lib, please note the importance of -s above, it is important, as it indicates that you are the one accepting this patch.
  • The --keep-cr helps when files being patched contain DOS CR/LF line endings.  It seems to be harmless when it isn't needed, but leave it off or use --no-keep-cr if you suspect it is causing issues.
  • The --ignore-whitespace helps when the only changes made to master since the patch was created are to whitespace in the context lines.  Without this option, some patches will fail to apply.  With that option, screeners can help avoid making contributors update patches merely because some whitespace changed in master.

Once you have a working copy, you should take note of the following kinds of things:

...