resolve conflicts

akkartik

Dec 7, 2023, 7:24 AM

6XLI6GURIVGWW7MOXND4BJVUNZJMJVGKRC3HAC3BBHWXMTI6ADHAC

Dependencies

[2] TG3DFQG5 resolve conflicts
[3] VPRGENLA hide some details within the 'warning' state
[4] ZLEPKWDJ fork: capture frontend for a note-taking system
[5] 3XQROLSK redo version checks yet again
[6] 5XQ4Y7NU reorg manual tests doc
[7] 2SAJWSNK automatically insert timestamp every time
[8] 6VJTQKW7 start supporting LÖVE v12
[9] 4VKEE43Z bugfix
[10] FE25XVZY yet another bugfix to the version check
[11] EGEOHXM6 Merge lines.love
[12] DRZIG4NU Merge lines.love
[13] WQOSZSUE warn on unused commandline args
[14] YGCT2D2O start loading settings as applicable
[15] 2Y7YH7UP infrastructure for caching LÖVE text objects
[16] DJQXH5EC Merge lines.love
[17] MSDHRXWU Merge upstream into main
[18] 7SICLTED check for 'error' mode in a few more places
[19] NEXUNNCF extract a function
[20] TSK2OXU2 .
[21] MHOUX5JF experiment: turn off JIT
[22] Z4KNS42N to open a file without a terminal, drag it on!
[23] OOL2X3B7 Merge upstream into main
[24] M6JI7UJ7 obsolete comment
[25] AJB4LFRB try to maintain a reasonable line width
[26] Z2VZTIXY redo version checks
[27] UVIDOW6Z Merge upstream into main
[28] G3VLJLDH use the background color
[29] R6GUSTBY default font size and line-height
[30] 7OVYFH6I Merge lines.love
[31] KMSL74GA support selections in the source editor
[32] L7YY2MW3 resolve conflicts
[33] XSLCFVFH .
[34] KKMFQDR4 editing source code from within the app
[35] 57OGXVHZ Merge lines.love
[36] NYMFNQDT Merge upstream into main
[*] OTIBCAUJ love2d scaffold
[*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing

Change contents

edit in main.lua at line 42

[4.127]→[4.371:430](∅→∅),[4.430]→[4.9:9](∅→∅),[4.197]→[4.9:9](∅→∅)

if Current_app == nil then
Current_app = 'run'
end
resurrect zombie in main.lua at line 42

[4.127]→[3.0:106](∅→∅),[4.127]→[3.0:106](∅→∅)

-- Current_app =
-- | run
-- | source
-- | {name=warning message='...' next_app = run|source}
edit in main.lua at line 47

[3.106]

[4.8]

if Current_app == nil then
Current_app = 'run'
end
replacement in main.lua at line 74

[4.186724]→[4.20:57](∅→∅)

elseif Current_app == 'error' then

[4.186724]

[4.16]

elseif current_app_is_warning() then
replacement in main.lua at line 80

[4.31]→[4.31:198](∅→∅),[4.198]→[2.20:112](∅→∅),[2.112]→[4.282:776](∅→∅),[4.282]→[4.282:776](∅→∅),[4.76]→[4.431:437](∅→∅),[4.776]→[4.431:437](∅→∅),[4.186724]→[4.431:437](∅→∅),[4.76]→[4.431:437](∅→∅),[4.776]→[4.431:437](∅→∅),[4.186724]→[4.431:437](∅→∅),[4.437]→[2.114:114](∅→∅),[4.437]→[2.114:114](∅→∅),[4.59]→[4.186725:186729](∅→∅),[2.114]→[4.186725:186729](∅→∅),[4.437]→[4.186725:186729](∅→∅),[4.88]→[4.186725:186729](∅→∅),[4.88]→[4.186725:186729](∅→∅)

function App.version_check()
-- available modes: run, error
Error_message = nil
Error_count = 0
-- we'll reuse error mode on load for an initial version check
local supported_versions = {'11.5', '11.4', '12.0'} -- put the recommended version first
local minor_version
Major_version, minor_version = love.getVersion()
Version = Major_version..'.'..minor_version
if array.find(supported_versions, Version) == nil then
Current_app = 'error'
Error_message = ("This app doesn't support version %s; please use version %s. Press any key to try it with this version anyway."):format(Version, supported_versions[1])
print(Error_message)
-- continue initializing everything; hopefully we won't have errors during initialization
end

end

[4.31]

[4.8]

function App.initialize_globals()
Supported_versions = {'11.5', '11.4', '12.0'} -- put the recommended version first
check_love_version_for_tests()
edit in main.lua at line 168

[4.579]

[4.579]

if current_app_is_warning() then return end
edit in main.lua at line 176

[4.807]→[4.60:97](∅→∅)

elseif Current_app == 'error' then
edit in main.lua at line 365

[4.268]→[4.778:778](∅→∅)
edit in main.lua at line 370

[4.188032]→[3.616:662](∅→∅),[4.188032]→[3.616:662](∅→∅),[4.186724]→[3.107:146](∅→∅),[4.186724]→[3.107:146](∅→∅)

if current_app_is_warning() then return end
elseif current_app_is_warning() then
resolve order conflict in main.lua at line 370

[3.1581]
replacement in Manual_tests.md at line 33

[4.211526]→[2.134:349](∅→∅)

* run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key. Press ctrl+e to edit source. Source editor opens up without checking version.

[4.211526]

[4.907]

* run with an untested version. Error message pops up. Press a key. Text editor comes up, and doesn't receive the key. Press ctrl+e. Error pops up. Press a key. Source editor opens up. Press ctrl+e. Error pops up. Press a key. Text editor returns.
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.
edit in Manual_tests.md at line 39

[4.328]→[2.351:351](∅→∅),[4.211526]→[4.1670:1918](∅→∅),[4.1918]→[4.1971:2103](∅→∅),[4.1971]→[4.1971:2103](∅→∅)

* run with an untested version. Error message pops up. Press a key. Text editor comes up, and doesn't receive the key. Press ctrl+e. Error pops up. Press a key. Source editor opens up. Press ctrl+e. Error pops up. Press a key. Text editor returns.
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.
resolve order conflict in Manual_tests.md at line 39

[4.328]

[4.211526]