Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

re-apply patches number 28 because they could have not been executed #220

Merged
merged 2 commits into from
Nov 13, 2016

Conversation

glensc
Copy link
Member

@glensc glensc commented Nov 13, 2016

It come out that there are two patches numbered as 28

Elan Ruusamäe @glensc Nov 09 07:23

oops, i noticed there are two patches numbered 28, @balsdorf and i suppose people randomly got executed either of the patches. seems both patches are ok to be skipped as they are data cleanup and changing db driver. i suppose it's best to rename them to be re-executed again?
https://gitter.im/eventum/eventum?at=5822b2ee6cb7207630536621

Bryan Alsdorf @balsdorf Nov 11 00:24

@glensc Regarding the duplicate patches: I agree that they should be renamed and re-run. Possibly leave a new 28 patch with a pointer to a PR for this
https://gitter.im/eventum/eventum?at=5824f38745c9e3eb43225bb5

$ ./bin/ci/check_patches.sh
Found 2 duplicate patch id
upgrade/patches/28_db_driver.php
upgrade/patches/28_history_context_convert.php

This PR will rename the patches so they would be executed again with next update.

@glensc glensc added this to the 3.1.5 milestone Nov 13, 2016
@glensc glensc self-assigned this Nov 13, 2016
@glensc glensc force-pushed the duplicate-patch-id branch 3 times, most recently from a9a30fa to e982a2a Compare November 13, 2016 10:51
$ ./bin/ci/check_patches.sh
Found 2 duplicate patch id
upgrade/patches/28_db_driver.php
upgrade/patches/28_history_context_convert.php
@glensc glensc changed the title check for duplicate patch id rename 28_history_context_convert.php and 28_db_driver.php patches to be executed again Nov 13, 2016
@glensc glensc changed the title rename 28_history_context_convert.php and 28_db_driver.php patches to be executed again re-apply patches number 28 because they could have not been executed Nov 13, 2016
@glensc glensc merged commit 8c3c9e8 into eventum:master Nov 13, 2016
@glensc glensc deleted the duplicate-patch-id branch November 13, 2016 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant