akkartik/sokoban.love - Change F2P336NOB6PL52DRVGBHW7UG4NUJFRQJWJNMQNX4JE52N5BA7Y5QC

resolve conflicts

Created by akkartik on December 7, 2023

F2P336NOB6PL52DRVGBHW7UG4NUJFRQJWJNMQNX4JE52N5BA7Y5QC

Dependencies

In channels

main

Change contents

Deletion in reference.md at line 24 [8.17]
B:BD[8.509] → [3.538:604]
```
## Functions you can implement that will get automatically called
```

Resurrecting zombie bytes in reference.md at line 24 [8.17]

B:B[8.509] → [9.0:144]

BD:B[8.509] → [9.0:144]

* `Version` -- the running version of LÖVE as a string, e.g. '11.4'.
* `Major_version` -- just the part before the period as an int, e.g. 11.

Insertion in reference.md at line 27 [8.17]

[9.144]

[8.948]

## Functions you can implement that will get automatically called

Deletion in main.lua at line 15 [12.2]

B:BD[10.38] → [11.8:161]

BD:BD[10.38] → [11.8:161]

B:BD[11.161] → [6.10:128]

∅:D[13.120] → [14.124:243]

∅:D[6.128] → [14.124:243]

B:BD[14.124] → [14.124:243]

∅:D[14.243] → [11.162:530]

B:BD[10.240] → [11.162:530]

BD:BD[10.240] → [11.162:530]

BD:BD[14.243] → [11.162:530]

B:BD[11.530] → [13.122:122]

BD:BD[11.530] → [13.122:122]

  -- available modes: run, error
  Mode = 'run'
  Error_message = nil
  Error_count = 0
  -- we'll reuse error mode on load for an initial version check
  Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '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
    Mode = '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

Replacement in main.lua at line 17 [12.2]

B:BD[15.2139] → [7.11:130]

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

[15.2139]

[7.130]

  Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '12.0'}  -- put the recommended version first
  -- Mode initialized elsewhere. Available modes: run, error
  Error_count = 0

Deletion in main.lua at line 32 [12.2]

B:BD[16.719] → [16.719:980]

∅:D[16.980] → [9.1005:1016]

B:BD[9.1005] → [9.1005:1016]

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

Deletion in main.lua at line 40 [12.2]
B:BD[17.104] → [2.9:9]
B:BD[15.2567] → [7.164:164]
BD:BD[15.2567] → [7.164:164]

Insertion in main.lua at line 66 [12.2]

[7.232]

  -- we'll reuse error mode on load for an initial version check

Replacement in main.lua at line 68 [12.2]

B:BD[7.289] → [7.289:316]

    Mode = 'version_check'

[7.289]

[7.316]

    Mode = 'error'
    if Error_message == nil then Error_message = '' end
    Error_message = ("This app hasn't been tested with LÖVE version %s; please use version %s if you run into errors. Press a key to try recovering.\n\n%s"):format(Version, Supported_versions[1], Error_message)
    print(Error_message)

Deletion in main.lua at line 160 [12.2]

B:BD[10.473] → [7.411:622]

BD:BD[10.473] → [7.411:622]

    love.graphics.printf(("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]), 40,40, 400)

Resurrecting zombie bytes in main.lua at line 160 [12.2]
∅:∅[7.622] → [10.664:681]
∅:∅[11.755] → [10.664:681]
B:B[10.664] → [10.664:681]
BD:B[10.664] → [10.664:681]
```
    return
  end
```
Solving an order conflict in main.lua at line 160 [12.2]
[11.755]
[10.664]
Deletion in main.lua at line 163 [12.2]
B:BD[19.40] → [4.13:13]
B:BD[15.6071] → [7.624:624]
BD:BD[15.6071] → [7.624:624]
Solving an order conflict in main.lua at line 163 [12.2]
[19.40]
[12.416]
Deletion in main.lua at line 225 [12.2]
B:BD[20.1283] → [4.15:15]
B:BD[21.67] → [7.626:626]
BD:BD[21.67] → [7.626:626]
Solving an order conflict in main.lua at line 225 [12.2]
[20.1283]
[22.223]
Deletion in main.lua at line 229 [12.2]
B:BD[10.1049] → [7.628:628]
BD:BD[10.1049] → [7.628:628]
Solving an order conflict in main.lua at line 229 [12.2]
[14.287]
[23.780]
Deletion in main.lua at line 235 [12.2]
B:BD[21.112] → [7.630:630]
BD:BD[21.112] → [7.630:630]
Solving an order conflict in main.lua at line 235 [12.2]
[20.1329]
[24.3116]
Deletion in main.lua at line 264 [12.2]
B:BD[25.247] → [6.130:130]
B:BD[22.466] → [7.634:634]
BD:BD[22.466] → [7.634:634]
B:BD[27.336] → [7.636:636]
BD:BD[27.336] → [7.636:636]
∅:D[7.636] → [28.1577:1581]
B:BD[28.1577] → [28.1577:1581]
B:BD[28.1581] → [7.638:638]
```
end
```
Solving an order conflict in main.lua at line 264 [12.2]
[25.247]
Insertion in app.lua at line 142 [30.2]
[29.61]
[5.0]
```
    print('tests failed; mode error')
```

Deletion in app.lua at line 145 [30.2]

B:BD[5.50] → [5.50:189]

B:BD[29.61] → [7.692:721]

    Error_message = 'There were test failures:\n\n'..table.concat(Test_errors, '\n')
    live.send_run_time_error_to_driver(Error_message)
    local error_message = ''

Solving an order conflict in app.lua at line 145 [30.2]
[5.50]
Insertion in app.lua at line 145 [30.2]
[0.716]
[7.721]
```
    Error_message = ''
```

Replacement in app.lua at line 147 [30.2]

B:BD[7.754] → [7.754:805]

      error_message = Warning_before_tests..'\n\n'

[7.754]

[7.805]

      Error_message = Warning_before_tests..'\n\n'

Replacement in app.lua at line 149 [30.2]

B:BD[7.813] → [7.813:960]

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

[7.813]

[29.131]

    Error_message = Error_message .. 'There were test failures:\n\n'..table.concat(Test_errors, '\n')
    live.send_run_time_error_to_driver(Error_message)

Deletion in app.lua at line 153 [30.2]
B:BD[31.276] → [32.140:162]
BD:BD[31.276] → [32.140:162]
```
  App.version_check()
```
Deletion in app.lua at line 551 [30.2]
B:BD[33.8166] → [7.1147:1147]
BD:BD[33.8166] → [7.1147:1147]

Insertion in Manual_tests.md at line 13 [35.1]

[7.1386]

[32.169]

  - create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.

resolve conflicts

Dependencies

In channels

Change contents

Deletion in reference.md at line 24 [8.17]

Resurrecting zombie bytes in reference.md at line 24 [8.17]

Insertion in reference.md at line 27 [8.17]

Deletion in main.lua at line 15 [12.2]

Replacement in main.lua at line 17 [12.2]

Deletion in main.lua at line 32 [12.2]

Deletion in main.lua at line 40 [12.2]

Insertion in main.lua at line 66 [12.2]

Replacement in main.lua at line 68 [12.2]

Deletion in main.lua at line 160 [12.2]

Resurrecting zombie bytes in main.lua at line 160 [12.2]

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

Deletion in main.lua at line 163 [12.2]

Solving an order conflict in main.lua at line 163 [12.2]

Deletion in main.lua at line 225 [12.2]

Solving an order conflict in main.lua at line 225 [12.2]

Deletion in main.lua at line 229 [12.2]

Solving an order conflict in main.lua at line 229 [12.2]

Deletion in main.lua at line 235 [12.2]

Solving an order conflict in main.lua at line 235 [12.2]

Deletion in main.lua at line 264 [12.2]

Solving an order conflict in main.lua at line 264 [12.2]

Insertion in app.lua at line 142 [30.2]

Deletion in app.lua at line 145 [30.2]

Solving an order conflict in app.lua at line 145 [30.2]

Insertion in app.lua at line 145 [30.2]

Replacement in app.lua at line 147 [30.2]

Replacement in app.lua at line 149 [30.2]

Deletion in app.lua at line 153 [30.2]

Deletion in app.lua at line 551 [30.2]

Insertion in Manual_tests.md at line 13 [35.1]