resolve conflicts

akkartik

May 6, 2025, 9:22 PM

N4R5DA3JKVIRNLOAFPR7GGFIAHALGBNQQKPINNFOXBH6KUDVL4QQC

Dependencies

• [2] ACTERT22 Merge lines.love
• [3] A42EMHOQ plumb through all supported args in LÖVE handlers
• [4] 3XQROLSK redo version checks yet again
• [5] LXW73CJ3 Merge lines.love
• [6] VPRGENLA hide some details within the 'warning' state
• [7] 2L5MEZV3 experiment: new edit namespace
• [8] KKMFQDR4 editing source code from within the app
• [9] AVTNUQYR basic test-enabled framework
• [10] LNUHQOGH start passing in Editor_state explicitly
• [11] S7ZZA3YE ugh, handle absolute as well as relative paths
• [12] OAHNWDYG .
• [13] KVHUFUFV reorg
• [14] APX2PY6G stop tracking wallclock time
• [15] UVJ6OCOE Merge lines.love
• [16] EQP53UQV autosave slightly less aggressively
• [17] RT6EV6OP delegate update events to drawings
• [18] 7CEOB56D Merge upstream into main
• [19] 2CK5QI7W make love event names consistent
• [20] EHADZNMB show any error after switching to source editor
• [21] 27DROQW2 Merge upstream into main
• [22] XX7G2FFJ intermingle freehand line drawings with text
• [23] PX7DDEMO autosave slightly less aggressively
• [24] 6VJTQKW7 start supporting LÖVE v12
• [25] 7SICLTED check for 'error' mode in a few more places
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 212
  [4.63]→[2.18:18](∅→∅),[4.63]→[2.18:18](∅→∅),[2.18]→[4.4537:4577](∅→∅),[4.8]→[4.4537:4577](∅→∅),[4.8]→[4.4537:4577](∅→∅)
  −

  − function App.keychord_press(chord, key)
• resurrect zombie in main.lua at line 212
  [4.8]→[3.2142:2203](∅→∅),[4.8]→[3.2142:2203](∅→∅)
  + function App.keychord_press(chord, key, scancode, is_repeat)
• resolve order conflict in main.lua at line 212
  [4.63]

  [3.2142]
• resurrect zombie in main.lua at line 213
  [3.2203]→[4.188715:188787](∅→∅),[4.4577]→[4.188715:188787](∅→∅),[4.188715]→[4.188715:188787](∅→∅),[4.4577]→[4.188715:188787](∅→∅)
  + -- ignore events for some time after window in focus (mostly alt-tab)
• resurrect zombie in main.lua at line 215
  [4.619]→[4.188836:188858](∅→∅),[4.188836]→[4.188836:188858](∅→∅),[4.188836]→[4.188836:188858](∅→∅)
  + return

  + end

  + --
• resurrect zombie in main.lua at line 228
  [4.1179]→[4.188858:189132](∅→∅),[4.188858]→[4.188858:189132](∅→∅),[4.188858]→[4.188858:189132](∅→∅)
  + if chord == 'C-e' then

  + -- carefully save settings

  + if Current_app == 'run' then

  + local source_settings = Settings.source

  + Settings = run.settings()

  + Settings.source = source_settings

  + if run.quit then run.quit() end

  + Current_app = 'source'
• resurrect zombie in main.lua at line 237
  [4.429]→[4.189132:189284](∅→∅),[4.189132]→[4.189132:189284](∅→∅),[4.189132]→[4.189132:189284](∅→∅)
  + elseif Current_app == 'source' then

  + Settings.source = source.settings()

  + if source.quit then source.quit() end

  + Current_app = 'run'
• resurrect zombie in main.lua at line 243
  [4.445]→[4.189284:189585](∅→∅),[4.456]→[4.189284:189585](∅→∅),[4.909]→[4.189284:189585](∅→∅),[4.189284]→[4.189284:189585](∅→∅),[4.189284]→[4.189284:189585](∅→∅)
  + else

  + assert(false, 'unknown app "'..Current_app..'"')

  + end

  + Settings.current_app = Current_app

  + love.filesystem.write('config', json.encode(Settings))

  + -- reboot

  + load_file_from_source_or_save_directory('main.lua')

  + App.undo_initialize()

  + App.run_tests_and_initialize()
• resurrect zombie in main.lua at line 253
  [4.1482]→[4.189585:189596](∅→∅),[4.189585]→[4.189585:189596](∅→∅),[4.189585]→[4.189585:189596](∅→∅)
  + return