Cathy Theys, Drupal-Entwicklerin

Video of updating a patch

Video of updating a patch, re-rolling, and making a tests-only patch for the Drupal testbot

This video has an example of re-rolling a patch that does not apply (a simple automatic merge with no conflicts). Also, it shows updating a patch and making an interdiff.

To get the most recent patch in this issue, http://drupal.org/node/1779658 about translatable strings, I copied the url for the patch from the browser, and then on the command line did curl -O and pasted in the url of the patch. After making a new branch, I used git to apply the patch. In the next video, I was able to do it a bit different.

The second video shows an example of updating a patch, making an interdiff, and creating a tests only patch for the testbot.

In this issue, http://drupal.org/node/1832300 about adding a backtrace, I used the command line drush am 1832300, to do some work for me. Drush created a nicely named branch for me, and applied the most recent patch posted in the issue.

To make the tests only patch, I committed all the changes, created the patch. Then:

  • git checkout 8.x
  • git checkout -b some-name
  • git apply thepatch.patch
  • git status
  • git checkout -- filenames-I-do-not-want-in-the-tests-only-patch
  • git add filenames-of-tests
  • git status (should show only tests being tracked and have changes)
  • git diff 8.x > filename-of-patch-tests-only.patch

Then, it's helpful to attach and upload the tests-only version of the patch first, followed by the complete patch (with the fix and the tests). This helps work with the testbot to have the issue status changes that the testbot makes end up resulting from the complete patch. Throw in the interdiff, and it's awesome.

Resources