| [01:37:26] | <FarmerEd[m]> | <paul121[m]> "Can you copy/paste this? Or does..." <- error: patch failed: src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php:5 |
| [01:37:26] | <FarmerEd[m]> | error: src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php: patch does not apply |
| [01:40:40] | <FarmerEd[m]> | I wonder did he start off with the latest? |
| [01:42:11] | <paul121[m]> | Huh. I was worried/curious about this |
| [01:43:03] | <paul121[m]> | Ah yes. The merge request page says: |
| [01:43:03] | <paul121[m]> | > Merge blocked: the source branch must be rebased onto the target branch. |
| [01:44:01] | <FarmerEd[m]> | Makes sense, the patch that does apply has this: |
| [01:44:02] | <paul121[m]> | So there is a conflict between the PR and the latest commits in that module |
| [01:44:02] | <FarmerEd[m]> | - "drupal/core": "^9 || ^10" |
| [01:44:02] | <FarmerEd[m]> | + "drupal/core": "^9" |
| [01:44:26] | <FarmerEd[m]> | which looks like going backwards |
| [01:44:58] | <FarmerEd[m]> | oh there was a -/+ in that |
| [01:45:14] | <paul121[m]> | Where do you see that? |
| [01:45:51] | <FarmerEd[m]> | in the patch that I generated in the beginning, with all the changes |
| [01:46:13] | <paul121[m]> | (this will be kinda annoying if every project needs to add a `|| ^10`, ugh) |
| [01:46:24] | <FarmerEd[m]> | It would explain why there were so many if it was also undoing other additions |
| [01:46:50] | <paul121[m]> | Yes. |
| [01:47:12] | <paul121[m]> | That's why it needs to rebased! |
| [01:47:23] | <FarmerEd[m]> | yep |
| [01:47:42] | <paul121[m]> | You could do that locally.. there will be conflicts to fix.. |
| [01:48:11] | <FarmerEd[m]> | It was too easy |
| [01:48:33] | <paul121[m]> | I believe you could open a new issue branch after you have rebased (or you can just add the new patch) |
| [01:48:35] | <paul121[m]> | Cool! |
| [01:50:26] | <FarmerEd[m]> | don't you sleep? must be late there now. |
| [01:51:50] | <FarmerEd[m]> | Anyway, thanks Paul I'll give it another look over later. |
| [01:53:48] | <paul121[m]> | Haha almost 11pm. Getting late |
| [01:54:50] | <FarmerEd[m]> | Ok, not as late as I thought |
| [04:49:35] | <FarmerEd[m]> | ACTION posted a file: 3267304-9.patch (3KiB) < https://libera.ems.host/_matrix/media/r0/download/matrix.org/jUkuQGAOItI... > |
| [04:49:38] | <FarmerEd[m]> | Thanks again paul121, think I have it working now with latest branch |
| [04:52:04] | <FarmerEd[m]> | mstenta: looks like the git diff command was right all along |
| [07:51:08] | <mstenta[m]> | Oh nice Farmer Ed ! Well done |
| [07:51:30] | <mstenta[m]> | So it was just because that branch needed to be rebased... that makes sense |
| [07:51:36] | <mstenta[m]> | Nice job |
| [07:55:08] | <FarmerEd[m]> | Guess a rookie error. |
| [07:55:08] | <FarmerEd[m]> | Just uploaded it to Drupal.org and updating composer.json now |
| [09:52:56] | <FarmerEd[m]> | OK mstenta , I updated the composer.json, and built a local docker image and so far it seems to be working as expected. |
| [09:52:56] | <FarmerEd[m]> | Is there any particular testing that I should run? |
| [09:53:08] | <mstenta[m]> | Awesome! |
| [09:53:41] | <mstenta[m]> | Probably the easiest thing to do is open a pull request with that change, so that all the GitHub Actions test workflows have a chance to run |
| [09:54:01] | <mstenta[m]> | But if the patch applies cleanly then you can be pretty confident those will all work |
| [10:01:15] | <mstenta[m]> | Farmer Ed: i will reply to GuyPaddock in that thread... |
| [10:11:17] | <FarmerEd[m]> | Ok, thanks I had not seen his response. |
| [12:00:12] | * TheSlurpee[m] has quit (Quit: You have been kicked for being idle) |
| [14:14:54] | <FarmerEd[m]> | Ok, I've opened a PR............................. (I think 🫠) |
| [14:26:26] | <mstenta[m]> | woo hoo! thanks Farmer Ed ! |
| [14:28:23] | <mstenta[m]> | looks good! I made a slight improvement to the commit message, if that's OK, and also added a `CHANGELOG.md` entry since I think this is worth mentioning (amended your commit so you get credit) :-) |
| [14:28:32] | <mstenta[m]> | tests are running on the PR now - then it's ready to merge! |
| [14:30:43] | <mstenta[m]> | oops hmm... something's not working. the build failed |
| [14:30:56] | <mstenta[m]> | but i don't think it's an issue with the patch |
| [14:32:22] | <mstenta[m]> | huh i wonder if it's because the branch isn't `2.x-*` |
| [14:32:45] | <mstenta[m]> | i just tried pushing a new branch to my fork called `2.x-err-patch`... i'll see if that works |
| [14:33:01] | <FarmerEd[m]> | No issue with any amendments |
| [14:33:19] | <FarmerEd[m]> | 🤞 |
| [14:33:54] | <FarmerEd[m]> | I'll work on my naming |
| [14:34:35] | <mstenta[m]> | looks like the patch applied properly in the build on my fork... it'll run tests there next, then i'll go ahead and merge the PR |
| [14:37:12] | <mstenta[m]> | (tests take 15+ minutes to run FYI... so it'll be a while) |
| [14:46:27] | <FarmerEd[m]> | well 15 min is not so bad considering it took me 3 days to add 3 lines to composer.json 😂 |
| [14:46:57] | <mstenta[m]> | first one's the hardest... all downhill from here! 😄 |
| [14:47:23] | <mstenta[m]> | patch workflow is "deep end" stuff for sure |
| [15:40:21] | <symbioquine[m]> | ACTION uploaded an image: (6068KiB) < https://libera.ems.host/_matrix/media/r0/download/matrix.org/uVuVMjgJxWF... > |
| [15:46:15] | <FarmerEd[m]> | Cool 😎 |
| [16:07:47] | <symbioquine[m]> | ACTION uploaded an image: (2617KiB) < https://libera.ems.host/_matrix/media/r0/download/matrix.org/PhRTRYGbFlg... > |
