[[ Bug 15302 ]] Fix "occured" - #5725
Conversation
|
Hi @bwmilby thanks for this. Essentially you need to do the following assuming you have develop setup to track upstream rather than your fork. If you haven't got that setup I can give you instructions for that too. When you rebase -i you will get a file pop up in your command line editor with with a list of your commits and you need to change |
|
I'm using SourceTree on Mac & PC, but both are set up to pull my fork's origin. I was able to update the develop on my Mac and then rebase. Will need to work on my local setup to keep it in sync. |
|
Build is failing due to spelling error in /livecode/ide/tests/core/idelibrary/errors.livecodescript |
|
@montegoulding @livecodeali : Is this likely to cause conflicts in future when merging up develop-8.1? If so, would it be better to rebase back to develop-8.1? |
|
Did a little digging trying to understand the build error. |
|
@runrevmark it probably would be good to rebase it yes @bwmilby Sourcetree is a handy git gui but it can be a little hard to use for more complicated things like interactive rebase. You should be able to add PS it could be that this patch touches files that have changed significantly between 8.1 and 9 in which case the above will leave you in a mess and you may need to |
Correct the spelling error of "occured" to "occurred". Most of the corrections were in comments. A few were in strings. 6 changes were to actual code, but were self contained within each function (engine\src\mac-menu.mm and engine\src\opensslsocket.cpp).
|
Rebase completed. 3 files do not exist in develop-8.1 branch and will need to be fixed in develop:
One of the additions to executionerrors.h in develop contains the error as well (EE-0897). Build still fails due to change to the EE-0863 comment. Added a new branch to my fork with these changes (bugfix-15302.1) that does not include any of the the ones in this PR. |
842322b to
2e5fc54
Compare
|
@livecode-vulcan review ok 2e5fc54 |
|
💙 review by @montegoulding ok 2e5fc54 |
|
😎 test success 2e5fc54
|
Correct the spelling error of "occured" to "occurred". Most of the corrections were in comments. A few were in strings. 6 changes were to actual code, but were self contained within each function (engine\src\mac-menu.mm and engine\src\opensslsocket.cpp).
7 changes to stack script of engine\src\Environment.rev - all were comments or strings.
2 changes in toolchain/gentle/gentle (int ErrorOccured / extern int ErrorOccured)
Did not fix error in revcapture.h since ErrorOccured(void) is part of a struct (MCCaptureSessionDelegate) and could not be certain it wasn't referenced somewhere else.