Critical important: fix a mistake after the yesterday doed selective merge with definitions.yaml and definitions.rs test file related - #697
Conversation
…inition.rs test file Signed-off-by: Attila Hammer <hammera@pickup.hu>
|
Thanks for the quick fix. |
* Add few tweaks into the Rules/Languages/hu/definitions.yaml file, Added missing definitions.rs test file the test/Languages/hu directory, and added SimpleSpeak test directory the mroot and menclose tests (#646) * Do more localization in Rules/Languages/hu/definitions.yaml Signed-off-by: Attila Hammer <hammera@pickup.hu> * Add in Simplespeak tests the definition, mroot and menclose tests Signed-off-by: Attila Hammer <hammera@pickup.hu> * fix some werbs in intervals into rules/Languages/hu/ClearSpeak_rules.yaml and SimpleSpeak_rules.yaml Signed-off-by: Attila Hammer <hammera@pickup.hu> * Fix tests after interval Clearspeak and SimpleSpeak verb change Signed-off-by: Attila Hammer <hammera@pickup.hu> --------- Signed-off-by: Attila Hammer <hammera@pickup.hu> * Apply Hungarian unicode fixes from PR #673 * Update Hungarian language and test rules from PR #694 * Fix a mistake after the selective merge with definitions.yaml and definition.rs test file (#697) Signed-off-by: Attila Hammer <hammera@pickup.hu> --------- Signed-off-by: Attila Hammer <hammera@pickup.hu> Co-authored-by: hammera <hammera@pickup.hu>
|
Neil, you're welcome, thanks for the quick merge both two branches (hu and main branches). Attila |
|
After a meeting in the morning, I will create a release candidate (branch). Only serious bug fixes should happen in that branch. Hopefully at the end of the week, it can be an official release. We are going to try to move to more frequent releases. Maybe every 6 weeks. However, I'm going on a 4 week holiday starting Aug 25, so I think the next release will more likely be in 2 months. The bottom line is that you shouldn't worry about problems unless they are critical as another release should always be coming up soon. |
|
This is me fine, thanks your answer. I wish you a fantastic new MathCat final version, and then I wish you a good rest during your four-week vacation. Attila |
Hi,
@NSoiffer, final with #694 PR related happened a selective merge the affected files related to the hu branch.
Unfortunatelly, happened a mistake during merge with Rules/Languages/hu/definitions.yaml and tests/Languages/hu/definitions.rs file.
Very interesting, when in yesterday evening resolve a merge conflith with the two hu branches related, checks is passed.
This day morning when I doed the update to you upstream hu branch, the tests doesn't pass with definitions.yaml file related.
The problem I easy solved.
Because I always doing backup copyes the affected files with a PR related, I restore this files, and doed a squashed commit with fixing the error.
very short diff output is following, with affects only two files my squashed commit:
If you have a short time, please merge this squashed commit into the hu branch of github.com/daisy/mathcat repository, and please merge this updated hu branch to the main branch of with upstream repository.
Thank you the good cooperation, hu branch now contains one new commit
Attila