akkartik/pensieve.love - Change 7BG5NS3RWA7UMWRRXOSXWUMUBQ5ZKEZKGWFXSF65HHOJXNQWVMPAC

resolve conflicts

Created by akkartik on December 7, 2023

7BG5NS3RWA7UMWRRXOSXWUMUBQ5ZKEZKGWFXSF65HHOJXNQWVMPAC

Dependencies

In channels

main

Change contents

Replacement in source.lua at line 377 [8.165766]

B:BD[6.173] → [7.13:44]

    save_settings_and_reboot()

[6.173]

[8.176892]

    love.filesystem.write('config', json.encode(Settings))
    load_file_from_source_or_save_directory('main.lua')
    App.undo_initialize()
    App.run_tests_and_initialize()

Insertion in main.lua at line 41 [11.2]

[9.60781]

[10.2643]


  -- Current_app =
  --  | run
  --  | source
  --  | {name=warning message='...' next_app = run|source}

Replacement in main.lua at line 77 [11.2]
B:BD[9.62552] → [3.23:60]
```
  elseif Current_app == 'error' then
```
[9.62552]
[12.824]
```
  elseif current_app_is_warning() then
```

Replacement in main.lua at line 83 [11.2]

B:BD[13.34] → [13.34:201]

B:BD[13.201] → [4.23:115]

∅:D[4.115] → [13.285:779]

B:BD[13.285] → [13.285:779]

∅:D[13.779] → [14.150:156]

∅:D[12.884] → [14.150:156]

∅:D[9.62552] → [14.150:156]

B:BD[14.150] → [14.150:156]

B:BD[14.156] → [9.62553:62557]

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

[13.34]

[14.156]

function App.initialize_globals()
  Supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first
  check_love_version_for_tests()

Deletion in main.lua at line 87 [11.2]
B:BD[14.157] → [9.62559:62559]
B:BD[9.62559] → [9.62560:62594]
```
function App.initialize_globals()
```
Replacement in main.lua at line 91 [11.2]
B:BD[9.62724] → [3.61:98]
```
  elseif Current_app == 'error' then
```
[9.62724]
[15.72]
```
  elseif current_app_is_warning() then
```

Deletion in main.lua at line 100 [11.2]

∅:D[16.135] → [9.62937:62971]

B:BD[9.62937] → [9.62937:62971]

∅:D[2.87] → [17.126:278]

B:BD[17.126] → [17.126:278]

∅:D[17.278] → [9.62971:63091]

B:BD[9.62971] → [9.62971:63091]

B:BD[9.63091] → [3.99:136]

∅:D[3.136] → [9.63091:63151]

B:BD[9.63091] → [9.63091:63151]

∅:D[18.284] → [15.113:119]

∅:D[9.63151] → [15.113:119]

B:BD[15.113] → [15.113:119]

B:BD[19.127] → [5.0:105]

BD:BD[19.127] → [5.0:105]

end
function App.initialize(arg)
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  love.keyboard.setKeyRepeat(true)
  love.graphics.setBackgroundColor(1,1,1)
  if Current_app == 'run' then
    run.initialize(arg)
  elseif Current_app == 'source' then
    source.initialize(arg)
  elseif Current_app == 'error' then
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
  -- Current_app =
  --  | run
  --  | source
  --  | {name=warning message='...' next_app = run|source}

Resurrecting zombie bytes in main.lua at line 100 [11.2]
B:B[5.105] → [5.105:106]
BD:B[5.105] → [5.105:106]
Deletion in main.lua at line 101 [11.2]
B:BD[20.88] → [8.186725:186729]
BD:BD[20.88] → [8.186725:186729]
B:BD[8.186724] → [5.107:146]
BD:BD[8.186724] → [5.107:146]
BD:BD[8.186724] → [5.107:146]
∅:D[21.55] → [23.12:13]
B:BD[23.12] → [23.12:13]
B:BD[23.13] → [2.89:89]
B:BD[24.414] → [25.20:21]
BD:BD[24.414] → [25.20:21]
BD:BD[24.414] → [25.20:21]
```
end
  elseif current_app_is_warning() then
```

Resurrecting zombie bytes in main.lua at line 101 [11.2]

B:B[25.21] → [25.21:377]

BD:B[25.21] → [25.21:377]

B:B[25.377] → [5.187:282]

BD:B[25.377] → [5.187:282]

∅:∅[5.282] → [25.468:619]

B:B[25.468] → [25.468:619]

BD:B[25.468] → [25.468:619]

∅:∅[25.672] → [22.299:401]

B:B[24.414] → [22.299:401]

BD:B[24.414] → [22.299:401]

B:B[22.432] → [22.432:596]

BD:B[22.432] → [22.432:596]

B:B[22.1005] → [22.1005:1016]

BD:B[22.1005] → [22.1005:1016]

  -- Another weird bit for a class of corner cases. E.g.:
  -- * I press ctrl+e, switch Current_app. I don't want the new app to receive
  --   text_input and key_release events.
  -- If I try to avoid text_input events by switching modes on key_release, I
  -- hit a new problem:
  -- * I press ctrl+e, am running an untested version, Current_app goes to
  --   'warning', and immediately rolls back out of 'warning' in the
  --   key_release event.
  -- Skip_rest_of_key_events is ugly, but feels cleaner than creating yet
  -- another possible value for Current_app.
  Skip_rest_of_key_events = nil
end
function check_love_version_for_tests()
  if array.find(Supported_versions, Version) == nil then
    -- warning to include in an error message if any tests failed
    Warning_before_tests = ("This app hasn't been tested with LÖVE version %s."):format(Version)
  end
end

Resurrecting zombie bytes in main.lua at line 121 [11.2]
B:B[8.186894] → [5.147:186]
BD:B[8.186894] → [5.147:186]
```
  elseif current_app_is_warning() then
```
Solving an order conflict in main.lua at line 121 [11.2]
[22.1016]

Insertion in main.lua at line 121 [11.2]

[0.542]

[5.147]

function App.initialize(arg)
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  love.keyboard.setKeyRepeat(true)
  love.graphics.setBackgroundColor(1,1,1)
  if Current_app == 'run' then
    run.initialize(arg)
  elseif Current_app == 'source' then
    source.initialize(arg)

Resurrecting zombie bytes in main.lua at line 132 [11.2]

B:B[8.187329] → [25.673:697]

BD:B[8.187329] → [25.673:697]

B:B[26.1320] → [25.698:785]

BD:B[26.1320] → [25.698:785]

B:B[25.785] → [5.323:521]

BD:B[25.785] → [5.323:521]

∅:∅[5.521] → [25.1031:1136]

B:B[25.1031] → [25.1031:1136]

BD:B[25.1031] → [25.1031:1136]


  check_love_version()
function check_love_version()
  if array.find(Supported_versions, Version) == nil then
    show_warning(
      ("This app hasn't been tested with LÖVE version %s; please switch to version %s if you run into issues. Press any key to continue."):format(Version, Supported_versions[1]))
    -- continue initializing everything; hopefully we won't have errors during initialization
  end
end

Insertion in main.lua at line 132 [11.2]

[5.186]

[25.673]

  else
    assert(false, 'unknown app "'..Current_app..'"')
  end

Insertion in main.lua at line 137 [11.2]
[25.697]
[25.698]
```
end
```
Replacement in main.lua at line 189 [11.2]
B:BD[3.239] → [3.239:276]
```
  elseif Current_app == 'error' then
```
[3.239]
[13.813]
```
  elseif current_app_is_warning() then
```

Replacement in main.lua at line 193 [11.2]

B:BD[13.959] → [13.959:1011]

    love.graphics.printf(Error_message, 40,40, 600)

[13.959]

[9.63296]

    love.graphics.printf(Current_app.message, 40,40, 600)

Insertion in main.lua at line 201 [11.2]
[16.244]
[9.63391]
```
  if current_app_is_warning() then return end
```
Deletion in main.lua at line 206 [11.2]
B:BD[9.63493] → [3.278:278]
B:BD[27.330] → [5.663:702]
BD:BD[27.330] → [5.663:702]
BD:BD[27.330] → [5.663:702]
B:BD[28.956] → [5.703:761]
BD:BD[28.956] → [5.703:761]
BD:BD[28.956] → [5.703:761]
```
  elseif current_app_is_warning() then
    love.graphics.printf(Current_app.message, 40,40, 600)
```
Solving an order conflict in main.lua at line 206 [11.2]
[9.63493]
[8.188491]
Deletion in main.lua at line 222 [11.2]
B:BD[8.188858] → [28.1044:1077]
D:D[25.1349] → [28.1044:1077]
BD:BD[8.188858] → [28.1044:1077]
```
  if Current_app == 'error' then
```
Resurrecting zombie bytes in main.lua at line 224 [11.2]
∅:∅[5.844] → [28.1077:1154]
B:B[28.1077] → [28.1077:1154]
BD:B[28.1077] → [28.1077:1154]
```
    if chord == 'C-c' then
      love.system.setClipboardText(Error_message)
```
Resurrecting zombie bytes in main.lua at line 229 [11.2]
∅:∅[25.1446] → [28.1154:1179]
B:B[28.1154] → [28.1154:1179]
BD:B[28.1154] → [28.1154:1179]
```
    end
    return
  end
```
Deletion in main.lua at line 252 [11.2]
B:BD[8.189395] → [7.52:83]
```
    save_settings_and_reboot()
```
Resurrecting zombie bytes in main.lua at line 252 [11.2]
B:B[8.189585] → [25.1447:1482]
BD:B[8.189585] → [25.1447:1482]
```
    Skip_rest_of_key_events = true
```

Insertion in main.lua at line 252 [11.2]

[8.189395]

[25.1447]

    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()

Deletion in main.lua at line 269 [11.2]

B:BD[29.164] → [7.84:120]

B:BD[7.120] → [30.409:478]

∅:D[30.478] → [7.182:298]

B:BD[7.182] → [7.182:298]

function save_settings_and_reboot()
  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()
end

Replacement in main.lua at line 270 [11.2]

B:BD[31.823] → [13.1075:1119]

  if Current_app == 'error' then return end

[31.823]

[9.63821]

  if current_app_is_warning() then return end

Deletion in main.lua at line 371 [11.2]
B:BD[32.268] → [3.280:280]
Deletion in main.lua at line 376 [11.2]
B:BD[24.521] → [5.762:808]
BD:BD[24.521] → [5.762:808]
BD:BD[24.521] → [5.762:808]
B:BD[26.1512] → [5.910:956]
BD:BD[26.1512] → [5.910:956]
BD:BD[26.1512] → [5.910:956]
B:BD[8.187263] → [5.283:322]
BD:BD[8.187263] → [5.283:322]
```
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
  elseif current_app_is_warning() then
```
Solving an order conflict in main.lua at line 376 [11.2]
[5.1581]

Replacement in Manual_tests.md at line 12 [34.1]

B:BD[33.398] → [33.398:652]

  - start out running the note-taking app, move window, press ctrl+e twice; window is running note-taking app in same position+dimensions
  - start out editing source, move window, press ctrl+e twice; window is editing source in same position+dimensions

[33.398]

[33.652]

  - start out running the note-taking app, move window, press ctrl+w twice; window is running note-taking app in same position+dimensions
  - start out editing source, move window, press ctrl+w twice; window is editing source in same position+dimensions

Replacement in Manual_tests.md at line 16 [34.1]

B:BD[35.6616] → [4.167:306]

  - 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.

[35.6616]

[4.306]

  - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  - run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.

Deletion in Manual_tests.md at line 41 [34.1]

B:BD[9.64816] → [9.64816:64994]


* start out in the note-taking app, press ctrl+e to edit source, make a change to the source, press ctrl+e twice to return to the source editor; the change should be preserved.

Deletion in Manual_tests.md at line 161 [34.1]

B:BD[4.329] → [4.329:722]

B:BD[8.211526] → [25.1670:1918]

BD:BD[8.211526] → [25.1670:1918]

* start out running the text editor, press ctrl+w to edit source, make a change to the source, press ctrl+e twice to return to the source editor; the change should be preserved.
* 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+w to edit source. Source editor opens up without checking version.
* 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.

Resurrecting zombie bytes in Manual_tests.md at line 161 [34.1]
∅:∅[25.1918] → [22.1971:2103]
B:B[22.1971] → [22.1971:2103]
BD:B[22.1971] → [22.1971:2103]
```
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.
```
Solving an order conflict in Manual_tests.md at line 161 [34.1]
[4.329]

Insertion in Manual_tests.md at line 161 [34.1]

[0.1848]

[22.1971]

* start out in the note-taking app, press ctrl+w to edit source, make a change to the source, press ctrl+w twice to return to the source editor; the change should be preserved.
* run with an untested version. Error message pops up. Press a key. App comes up, and doesn't receive the key. Press ctrl+w. Error pops up. Press a key. Source editor opens up. Press ctrl+w. Error pops up. Press a key. App returns.

Deletion in Manual_tests.md at line 191 [34.1]
B:BD[36.156] → [22.1642:1778]
BD:BD[36.156] → [22.1642:1778]
BD:BD[36.156] → [22.1642:1778]
∅:D[22.1778] → [38.23:121]
B:BD[36.295] → [38.23:121]
BD:BD[36.295] → [38.23:121]
BD:BD[36.295] → [38.23:121]
```
  - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  - run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.
```
Solving an order conflict in Manual_tests.md at line 191 [34.1]
[39.16279]

resolve conflicts

Dependencies

In channels

Change contents

Replacement in source.lua at line 377 [8.165766]

Insertion in main.lua at line 41 [11.2]

Replacement in main.lua at line 77 [11.2]

Replacement in main.lua at line 83 [11.2]

Deletion in main.lua at line 87 [11.2]

Replacement in main.lua at line 91 [11.2]

Deletion in main.lua at line 100 [11.2]

Resurrecting zombie bytes in main.lua at line 100 [11.2]

Deletion in main.lua at line 101 [11.2]

Resurrecting zombie bytes in main.lua at line 101 [11.2]

Resurrecting zombie bytes in main.lua at line 121 [11.2]

Solving an order conflict in main.lua at line 121 [11.2]

Insertion in main.lua at line 121 [11.2]

Resurrecting zombie bytes in main.lua at line 132 [11.2]

Insertion in main.lua at line 132 [11.2]

Insertion in main.lua at line 137 [11.2]

Replacement in main.lua at line 189 [11.2]

Replacement in main.lua at line 193 [11.2]

Insertion in main.lua at line 201 [11.2]

Deletion in main.lua at line 206 [11.2]

Solving an order conflict in main.lua at line 206 [11.2]

Deletion in main.lua at line 222 [11.2]

Resurrecting zombie bytes in main.lua at line 224 [11.2]

Resurrecting zombie bytes in main.lua at line 229 [11.2]

Deletion in main.lua at line 252 [11.2]

Resurrecting zombie bytes in main.lua at line 252 [11.2]

Insertion in main.lua at line 252 [11.2]

Deletion in main.lua at line 269 [11.2]

Replacement in main.lua at line 270 [11.2]

Deletion in main.lua at line 371 [11.2]

Deletion in main.lua at line 376 [11.2]

Solving an order conflict in main.lua at line 376 [11.2]

Replacement in Manual_tests.md at line 12 [34.1]

Replacement in Manual_tests.md at line 16 [34.1]

Deletion in Manual_tests.md at line 41 [34.1]

Deletion in Manual_tests.md at line 161 [34.1]

Resurrecting zombie bytes in Manual_tests.md at line 161 [34.1]

Solving an order conflict in Manual_tests.md at line 161 [34.1]

Insertion in Manual_tests.md at line 161 [34.1]

Deletion in Manual_tests.md at line 191 [34.1]

Solving an order conflict in Manual_tests.md at line 191 [34.1]