drush make build-spark.make fails [#1897248]

Drush make is failing with:

drupal patched with editor_true_wysiwyg-1886566-1-do-not-test.patch. [ok]
Unable to patch drupal with unified-edit-prototype-demo-37.patch.    [error]

If I drush make with --force-complete, and then try and apply the patch by hand, these are the errors:


webchicks-MacBook-Pro:spork webchick$ git apply unified-edit-prototype-demo-37.patch 
error: patch failed: core/modules/block/block.admin.inc:78
error: core/modules/block/block.admin.inc: patch does not apply
error: patch failed: core/modules/block/block.module:129
error: core/modules/block/block.module: patch does not apply
error: patch failed: core/modules/block/lib/Drupal/block/BlockBase.php:233
error: core/modules/block/lib/Drupal/block/BlockBase.php: patch does not apply
error: patch failed: core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php:254
error: core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php: patch does not apply
error: patch failed: core/modules/menu/lib/Drupal/menu/MenuFormController.php:21
error: core/modules/menu/lib/Drupal/menu/MenuFormController.php: patch does not apply
error: patch failed: core/modules/menu/lib/Drupal/menu/MenuListController.php:47
error: core/modules/menu/lib/Drupal/menu/MenuListController.php: patch does not apply
error: patch failed: core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php:123
error: core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php: patch does not apply
error: patch failed: core/modules/menu/menu.admin.inc:7
error: core/modules/menu/menu.admin.inc: patch does not apply
error: patch failed: core/modules/menu/menu.module:99
error: core/modules/menu/menu.module: patch does not apply
error: patch failed: core/modules/overlay/overlay-child-rtl.css:12
error: core/modules/overlay/overlay-child-rtl.css: patch does not apply
error: patch failed: core/modules/overlay/overlay-child.css:21
error: core/modules/overlay/overlay-child.css: patch does not apply
error: patch failed: core/modules/overlay/overlay-child.js:163
error: core/modules/overlay/overlay-child.js: patch does not apply
error: patch failed: core/modules/overlay/overlay-parent.js:554
error: core/modules/overlay/overlay-parent.js: patch does not apply
error: patch failed: core/modules/overlay/templates/overlay.tpl.php:23
error: core/modules/overlay/templates/overlay.tpl.php: patch does not apply
error: patch failed: core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php:112
error: core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php: patch does not apply
error: patch failed: core/modules/system/system.module:254
error: core/modules/system/system.module: patch does not apply
error: patch failed: core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php:74
error: core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php: patch does not apply

Looking into it...

Comments

Comment #1

webchick

she/they

English

Vancouver 🇨🇦

commented 24 January 2013 at 04:51

Here's output from patch -p1:

$ patch -p1 < unified-edit-prototype-demo-37.patch 
patching file core/includes/form.inc
Hunk #1 succeeded at 2644 (offset 16 lines).
patching file core/modules/block/block.admin.inc
Hunk #1 FAILED at 78.
1 out of 1 hunk FAILED -- saving rejects to file core/modules/block/block.admin.inc.rej
patching file core/modules/block/block.module
Hunk #1 FAILED at 129.
1 out of 1 hunk FAILED -- saving rejects to file core/modules/block/block.module.rej
patching file core/modules/block/lib/Drupal/block/BlockBase.php
Hunk #1 succeeded at 286 with fuzz 2 (offset 53 lines).
Hunk #2 FAILED at 317.
1 out of 2 hunks FAILED -- saving rejects to file core/modules/block/lib/Drupal/block/BlockBase.php.rej
patching file core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php.rej
patching file core/modules/menu/lib/Drupal/menu/MenuFormController.php
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file core/modules/menu/lib/Drupal/menu/MenuFormController.php.rej
patching file core/modules/menu/lib/Drupal/menu/MenuListController.php
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file core/modules/menu/lib/Drupal/menu/MenuListController.php.rej
patching file core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php.rej
patching file core/modules/menu/menu.admin.inc
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
10 out of 10 hunks ignored -- saving rejects to file core/modules/menu/menu.admin.inc.rej
patching file core/modules/menu/menu.module
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file core/modules/menu/menu.module.rej
patching file core/modules/overlay/overlay-child-rtl.css
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file core/modules/overlay/overlay-child-rtl.css.rej
patching file core/modules/overlay/overlay-child.css
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file core/modules/overlay/overlay-child.css.rej
patching file core/modules/overlay/overlay-child.js
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file core/modules/overlay/overlay-child.js.rej
patching file core/modules/overlay/overlay-parent.js
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file core/modules/overlay/overlay-parent.js.rej
patching file core/modules/overlay/templates/overlay.tpl.php
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file core/modules/overlay/templates/overlay.tpl.php.rej
patching file core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php.rej
patching file core/modules/system/system.module
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file core/modules/system/system.module.rej
patching file core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php.rej

I'm assuming a lot of these are because some of these patches were already committed. e.g. #1893740: Remove repeated "Block" UI text from block editing, fix title.