Problem/Motivation

Failing to upgrade using the Custom Upstream on Pantheon for Drupal Panopoly 7.x-1.89 updating from 7.x-1.88.

i get message “Something went wrong when applying updates. I tried in on multidev (updates) unsuccessfully and I tried creating a new multidev (build) but that did not work either. I also tried selected “Auto-resolve conflicts” with no success.

Pantheon Support replied:
Upon checking, it seems that this a custom upstream, I checked the internal logs and saw this error:
[409] [“CONFLICT (modify/delete): PATCHES.txt deleted in upstream/master and modified in HEAD. Version HEAD of PATCHES.txt left in tree.”]

Please double-check this update with your team that manages the custom upstream.

Steps to reproduce

Resolution

The PATCHES.txt file is created with the Drush make command. The PATCHES.txt file is added by 'drush make' so that it's easy to see which patches were added by the .make file. It's informational only, so it's fine to remove it!

It possibly found it's way into the upstream or local repo which caused the error.

Remaining tasks

Comments

bsnodgrass created an issue. See original summary.

bsnodgrass’s picture

bsnodgrass commented

Trying on an old Panopoly Pantheon Upstream site. This one was frozen at Panopoly 7.x-1.78

same result in the dashboard - no access to Pantheon logs

bsnodgrass’s picture

bsnodgrass commented
Issue summary: View changes

Using a pantheon multidev I was able to remove the PATCHES.txt to test bypass for merge errors on update to panopoly7.x-1.89

This worked without issue for me.

Please advise if we should worry about removing that file.

dsnopek’s picture

dsnopek
he/him
Primary language English
Location USA
commented
Status: Active » Fixed

The PATCHES.txt file is added by 'drush make' so that it's easy to see which patches were added by the .make file. It's informational only, so it's fine to remove it!

bsnodgrass’s picture

bsnodgrass commented
Category: Bug report » Support request
Priority: Major » Normal
Issue summary: View changes
Status: Fixed » Closed (fixed)

Thanks @dsnopek!

Updating Summary