akkartik/pothi.love - Change MX7YD2WCLJSLML3DSDVU3YLTALIVPTM7H7LNGSHEEUPOJGQHWUAAC

resolve conflicts

Created by akkartik on December 7, 2023

MX7YD2WCLJSLML3DSDVU3YLTALIVPTM7H7LNGSHEEUPOJGQHWUAAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 35 [7.2]
B:BD[5.127] → [6.184850:184903]
B:BD[6.184903] → [8.33:33]
```
  if Current_app == nil then
    Current_app = 'run'
```

Resurrecting zombie bytes in main.lua at line 35 [7.2]

B:B[5.127] → [4.0:106]

BD:B[5.127] → [4.0:106]

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

Insertion in main.lua at line 40 [7.2]

[4.106]

[9.460]

  if Current_app == nil then
    Current_app = 'run'

Deletion in main.lua at line 78 [7.2]
B:BD[10.88] → [11.186725:186729]
BD:BD[10.88] → [11.186725:186729]
```
end
```

Resurrecting zombie bytes in main.lua at line 78 [7.2]

B:B[13.31] → [12.145:298]

BD:B[13.31] → [12.145:298]

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 82 [7.2]
B:BD[14.611] → [6.186247:186281]
BD:BD[14.611] → [6.186247:186281]
```
function App.initialize_globals()
```

Resurrecting zombie bytes in main.lua at line 82 [7.2]

B:B[6.186281] → [6.186281:186411]

BD:B[6.186281] → [6.186281:186411]

  if Current_app == 'run' then
    run.initialize_globals()
  elseif Current_app == 'source' then
    source.initialize_globals()

Deletion in main.lua at line 86 [7.2]
B:BD[6.186411] → [2.20:57]
```
  elseif Current_app == 'error' then
```
Resurrecting zombie bytes in main.lua at line 86 [7.2]
∅:∅[2.57] → [6.186411:186477]
B:B[6.186411] → [6.186411:186477]
BD:B[6.186411] → [6.186411:186477]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
```
Insertion in main.lua at line 86 [7.2]
[6.186411]
[6.186411]
```
  elseif current_app_is_warning() then
```
Resurrecting zombie bytes in main.lua at line 95 [7.2]
∅:∅[16.414] → [8.38:42]
B:B[11.187113] → [8.38:42]
BD:B[16.414] → [8.38:42]
BD:B[11.187113] → [8.38:42]
```
end
```

Insertion in main.lua at line 95 [7.2]

[16.414]

[8.38]


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

Insertion in main.lua at line 108 [7.2]

[8.42]

[12.1005]


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)

Insertion in main.lua at line 155 [7.2]
[11.187701]
[17.8062]
```
  if current_app_is_warning() then return end
```
Deletion in main.lua at line 160 [7.2]
B:BD[11.187701] → [4.569:615]
BD:BD[11.187701] → [4.569:615]
B:BD[18.4536] → [2.58:95]
```
  if current_app_is_warning() then return end
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 160 [7.2]
[18.4536]
[6.187341]
Insertion in main.lua at line 166 [7.2]
[6.187493]
[6.187493]
```
  if current_app_is_warning() then return end
```
Replacement in main.lua at line 184 [7.2]
B:BD[2.198] → [2.198:235]
```
  elseif Current_app == 'error' then
```
[2.198]
[19.544]
```
  elseif current_app_is_warning() then
```

Replacement in main.lua at line 188 [7.2]

B:BD[19.690] → [19.690:742]

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

[19.690]

[6.187885]

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

Deletion in main.lua at line 192 [7.2]
B:BD[6.187951] → [2.237:237]
B:BD[20.330] → [4.663:702]
BD:BD[20.330] → [4.663:702]
BD:BD[20.330] → [4.663:702]
B:BD[13.956] → [4.703:761]
BD:BD[13.956] → [4.703:761]
BD:BD[13.956] → [4.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 192 [7.2]
[6.187951]
[7.416]
Deletion in main.lua at line 264 [7.2]
B:BD[21.1512] → [13.1180:1224]
BD:BD[21.1512] → [13.1180:1224]
```
  if Current_app == 'error' then return end
```
Resurrecting zombie bytes in main.lua at line 264 [7.2]
B:B[13.1224] → [19.780:852]
BD:B[13.1224] → [19.780:852]
```
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Insertion in main.lua at line 264 [7.2]
[21.1512]
[19.780]
```
  if current_app_is_warning() then return end
```
Insertion in main.lua at line 281 [7.2]
[22.57]
[23.71]
```
  if current_app_is_warning() then return end
```

Replacement in main.lua at line 298 [7.2]

B:BD[6.190074] → [19.900:944]

  if Current_app == 'error' then return end

[6.190074]

  if current_app_is_warning() then return end

Deletion in main.lua at line 310 [7.2]
B:BD[24.889] → [19.948:948]
BD:BD[24.889] → [19.948:948]
∅:D[19.948] → [13.1360:1404]
B:BD[25.925] → [13.1360:1404]
BD:BD[25.925] → [13.1360:1404]
```
  if Current_app == 'error' then return end
```
Resurrecting zombie bytes in main.lua at line 310 [7.2]
B:B[25.925] → [4.1098:1144]
BD:B[25.925] → [4.1098:1144]
```
  if current_app_is_warning() then return end
```
Solving an order conflict in main.lua at line 310 [7.2]
[24.889]
[4.1098]

Replacement in main.lua at line 321 [7.2]

B:BD[24.1071] → [19.949:993]

  if Current_app == 'error' then return end

[24.1071]

[6.190430]

  if current_app_is_warning() then return end

Replacement in main.lua at line 332 [7.2]

B:BD[6.190738] → [19.996:1040]

  if Current_app == 'error' then return end

[6.190738]

  if current_app_is_warning() then return end

Deletion in main.lua at line 363 [7.2]
B:BD[26.268] → [2.239:239]

Deletion in main.lua at line 368 [7.2]

B:BD[11.191282] → [4.1145:1191]

BD:BD[11.191282] → [4.1145:1191]

B:BD[11.190979] → [4.1051:1097]

BD:BD[11.190979] → [4.1051:1097]

B:BD[11.190617] → [4.1004:1050]

BD:BD[11.190617] → [4.1004:1050]

B:BD[22.57] → [4.957:1003]

BD:BD[22.57] → [4.957:1003]

B:BD[21.1512] → [4.910:956]

BD:BD[21.1512] → [4.910:956]

B:BD[11.188032] → [4.616:662]

BD:BD[11.188032] → [4.616:662]

B:BD[27.414] → [15.20:377]

BD:BD[27.414] → [15.20:377]

B:BD[15.377] → [4.187:282]

BD:BD[15.377] → [4.187:282]

∅:D[4.282] → [15.468:619]

B:BD[15.468] → [15.468:619]

BD:BD[15.468] → [15.468:619]

∅:D[15.672] → [12.299:401]

B:BD[27.414] → [12.299:401]

BD:BD[27.414] → [12.299:401]

B:BD[12.432] → [12.432:596]

BD:BD[12.432] → [12.432:596]

B:BD[11.186894] → [4.147:186]

BD:BD[11.186894] → [4.147:186]

  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
  -- 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)
  elseif current_app_is_warning() then

Solving an order conflict in main.lua at line 368 [7.2]
[4.1581]
Insertion in app.lua at line 11 [28.2]
[28.54]
[6.209221]
```
  Version, Major_version = App.love_version()
```

Insertion in app.lua at line 88 [28.2]

[21.5849]

[6.209278]

function App.love_version()
  local major_version, minor_version = love.getVersion()
  local version = major_version..'.'..minor_version
  return version, major_version
end

Replacement in app.lua at line 111 [28.2]

B:BD[29.35229] → [30.10165:10263]

    error(('There were %d test failures:\n\n%s'):format(#Test_errors, table.concat(Test_errors)))

[29.35229]

[29.35299]

    local error_message = ''
    if Warning_before_tests then
      error_message = Warning_before_tests..'\n\n'
    end
    error_message = error_message .. ('There were %d test failures:\n%s'):format(#Test_errors, table.concat(Test_errors))
    error(error_message)

Deletion in app.lua at line 527 [28.2]

B:BD[21.5849] → [12.1198:1372]

BD:BD[21.5849] → [12.1198:1372]

B:BD[31.60589] → [12.1373:1641]

BD:BD[31.60589] → [12.1373:1641]

B:BD[28.54] → [12.1017:1063]

BD:BD[28.54] → [12.1017:1063]

function App.love_version()
  local major_version, minor_version = love.getVersion()
  local version = major_version..'.'..minor_version
  return version, major_version
end
    local error_message = ''
    if Warning_before_tests then
      error_message = Warning_before_tests..'\n\n'
    end
    error_message = error_message .. ('There were %d test failures:\n%s'):format(#Test_errors, table.concat(Test_errors))
    error(error_message)
  Version, Major_version = App.love_version()

Solving an order conflict in app.lua at line 527 [28.2]
[21.8166]

Replacement in Manual_tests.md at line 20 [9.1]

B:BD[3.40] → [3.40:179]

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

[3.40]

[32.158]

  - 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 62 [9.1]
B:BD[33.16279] → [3.181:181]
B:BD[34.156] → [12.1642:1778]
BD:BD[34.156] → [12.1642:1778]
BD:BD[34.156] → [12.1642:1778]
∅:D[12.1778] → [35.23:121]
B:BD[34.295] → [35.23:121]
BD:BD[34.295] → [35.23:121]
BD:BD[34.295] → [35.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 62 [9.1]
[33.16279]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 35 [7.2]

Resurrecting zombie bytes in main.lua at line 35 [7.2]

Insertion in main.lua at line 40 [7.2]

Deletion in main.lua at line 78 [7.2]

Resurrecting zombie bytes in main.lua at line 78 [7.2]

Deletion in main.lua at line 82 [7.2]

Resurrecting zombie bytes in main.lua at line 82 [7.2]

Deletion in main.lua at line 86 [7.2]

Resurrecting zombie bytes in main.lua at line 86 [7.2]

Insertion in main.lua at line 86 [7.2]

Resurrecting zombie bytes in main.lua at line 95 [7.2]

Insertion in main.lua at line 95 [7.2]

Insertion in main.lua at line 108 [7.2]

Insertion in main.lua at line 155 [7.2]

Deletion in main.lua at line 160 [7.2]

Solving an order conflict in main.lua at line 160 [7.2]

Insertion in main.lua at line 166 [7.2]

Replacement in main.lua at line 184 [7.2]

Replacement in main.lua at line 188 [7.2]

Deletion in main.lua at line 192 [7.2]

Solving an order conflict in main.lua at line 192 [7.2]

Deletion in main.lua at line 264 [7.2]

Resurrecting zombie bytes in main.lua at line 264 [7.2]

Insertion in main.lua at line 264 [7.2]

Insertion in main.lua at line 281 [7.2]

Replacement in main.lua at line 298 [7.2]

Deletion in main.lua at line 310 [7.2]

Resurrecting zombie bytes in main.lua at line 310 [7.2]

Solving an order conflict in main.lua at line 310 [7.2]

Replacement in main.lua at line 321 [7.2]

Replacement in main.lua at line 332 [7.2]

Deletion in main.lua at line 363 [7.2]

Deletion in main.lua at line 368 [7.2]

Solving an order conflict in main.lua at line 368 [7.2]

Insertion in app.lua at line 11 [28.2]

Insertion in app.lua at line 88 [28.2]

Replacement in app.lua at line 111 [28.2]

Deletion in app.lua at line 527 [28.2]

Solving an order conflict in app.lua at line 527 [28.2]

Replacement in Manual_tests.md at line 20 [9.1]

Deletion in Manual_tests.md at line 62 [9.1]

Solving an order conflict in Manual_tests.md at line 62 [9.1]