The drop is always movingYou know that saying about standing on the shoulders of giants? Drupal is standing on a huge pile of midgetsAll content management systems suck, Drupal just happens to suck less.Popular open source software is more secure than unpopular open source software, because insecure software becomes unpopular fast. [That doesn't happen for proprietary software.]Drupal makes sandwiches happen.There is a module for that

Simple core workflow

Submitted by nk on Sat, 2013-08-24 03:26

Based on a discussion on IRC this is not apparent to everyone so let me write down quick my core workflow:

git apply --index something.patch
... hack
git diff > interdiff.txt
git diff HEAD > new.patch

Should the patch not apply then
patch -p1 < something.patch
... resolve conflicts
... stage the new files
git add `grep -A1 /dev/null something.patch |grep b/|cut -c 7-`
... hack
git diff HEAD > new.patch

Commenting on this Story is closed.

Submitted by Anonymous on Sat, 2013-08-24 06:35.

... hack
drush iqs "Fixed it for you"

The nice thing about iqs (drush iq-submit) is that not only does it produce the interdiff for you, but it also uploads the patch and interdiff and attaches them to the issue, all from the commandline (almost as good as a pull request -- almost).

If there is no patch on the issue yet:

... hack
drush iqs ISSUENUMBER "Fixed it for you"

This tool is fun to use, but not perfect. If the patch doesn't apply, you're on your own (see above). It's fun to use, but largely ignored. The migration to Drupal 7 is going to break it; not sure if I will fix it, or if anyone will pick it up, but it's worth a try while it's still working.

- greg.1.anderson

Submitted by chx (not verified) on Sat, 2013-08-24 07:30.

It does look good, I will test, thanks for the tool!