akkartik/wardley.love - Change EWW3WWJMYBMP2Y2KZ52MIEFVYVRQFRYTJJ3FQXLEXL5DSQXCJQBQC

resolve conflicts

Created by akkartik on August 26, 2023

EWW3WWJMYBMP2Y2KZ52MIEFVYVRQFRYTJJ3FQXLEXL5DSQXCJQBQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in reference.md at line 67 [8.17]
B:B[8.2384] → [4.1593:1668]
BD:B[8.2384] → [4.1593:1668]
```
* `on.update(dt)` -- called after every call to `on.draw`. Make changes to
```
Insertion in reference.md at line 67 [8.17]
[8.2384]
[4.1593]
```
<<<<<<< HEAD
```
Solving an order conflict in reference.md at line 69 [8.17]
[4.1668]

Insertion in reference.md at line 69 [8.17]

[0.14]

[6.17]

  your app's variables here rather than in `on.draw`. Provides in `dt` the
  time since the previous call to `on.update`, which can be useful for things
=======

Insertion in reference.md at line 75 [8.17]
[6.249]
[8.2613]
```
>>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c
```
Resurrecting zombie bytes in reference.md at line 87 [8.17]
B:B[8.3222] → [4.1903:1978]
BD:B[8.3222] → [4.1903:1978]
```
* `on.mouse_release(x,y, mouse_button)` -- called when you release a mouse
```
Insertion in reference.md at line 87 [8.17]
[8.3222]
[4.1903]
```
<<<<<<< HEAD
```
Resurrecting zombie bytes in reference.md at line 89 [8.17]
B:B[8.3298] → [6.250:319]
BD:B[8.3298] → [6.250:319]
```
  button. Provides the same arguments as `App.mousepressed()` above.
```
Solving an order conflict in reference.md at line 89 [8.17]
[4.1978]

Insertion in reference.md at line 89 [8.17]

[0.241]

[6.250]

  button. Provides the same arguments as `on.mouse_press()` above.
=======
* `App.mousereleased(x,y, mouse_button)` -- called when you release a mouse

Insertion in reference.md at line 93 [8.17]
[6.319]
[8.3365]
```
>>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c
```
Insertion in reference.md at line 117 [8.17]
[8.4583]
[4.2426]
```
<<<<<<< HEAD
```
Solving an order conflict in reference.md at line 119 [8.17]
[4.2498]
Insertion in reference.md at line 119 [8.17]
[0.458]
[7.0]
```
=======
```
Insertion in reference.md at line 121 [8.17]
[7.73]
[8.4655]
```
>>>>>>> e7085e1e17e84291ef4d990708790ca899fb5c3c
```
Replacement in app.lua at line 134 [10.2]
B:BD[9.4492] → [5.10:10]
B:BD[5.10] → [5.11:36]
```
function App.run_tests()
```
[9.4492]
[5.36]
```
function App.run_tests(record_error_fn)
```

Insertion in app.lua at line 142 [10.2]

[5.213]

  local globals = App.shallow_copy_all_globals()
  App = App_for_tests
  local saved_font = love.graphics.getFont()
  love.graphics.setFont(Love_snapshot.initial_font)

Replacement in app.lua at line 149 [10.2]

B:BD[5.311] → [5.311:416]

--?     _G[name]()
    xpcall(_G[name], function(err) prepend_debug_info_to_test_failure(name, err) end)

[5.311]

[5.416]

    xpcall(_G[name], function(err) record_error_fn(name, err) end)

Replacement in app.lua at line 151 [10.2]

B:BD[5.422] → [5.422:518]

  -- clean up all test methods
  for _,name in ipairs(sorted_names) do
    _G[name] = nil
  end

[5.422]

[5.518]

  love.graphics.setFont(saved_font)
  -- restore all global state except Test_errors
  local test_errors = Test_errors
  App.restore_all_globals(globals)
  Test_errors = test_errors

Insertion in app.lua at line 158 [10.2]

[5.523]

function App.run_test(test, record_error_fn)
  local globals = App.shallow_copy_all_globals()
  App = App_for_tests
  local saved_font = love.graphics.getFont()
  love.graphics.setFont(Love_snapshot.initial_font)
    App.initialize_for_test()
    xpcall(test, function(err) record_error_fn('', err) end)
  love.graphics.setFont(saved_font)
  -- restore all global state except Test_errors
  local test_errors = Test_errors
  App.restore_all_globals(globals)
  Test_errors = test_errors
end

Deletion in app.lua at line 419 [10.2]
∅:D[11.541] → [12.1467:1472]
∅:D[13.5198] → [12.1467:1472]
B:BD[12.1467] → [12.1467:1472]
B:BD[14.7396] → [15.73:113]
BD:BD[14.7396] → [15.73:113]
B:BD[16.8001] → [2.18:67]
BD:BD[16.8001] → [2.18:67]
∅:D[2.67] → [17.1959:1981]
B:BD[17.1959] → [17.1959:1981]
BD:BD[17.1959] → [17.1959:1981]
B:BD[17.1981] → [2.68:165]
BD:BD[17.1981] → [2.68:165]
B:BD[18.47] → [19.1966:1994]
BD:BD[18.47] → [19.1966:1994]
B:BD[19.1994] → [3.21:88]
BD:BD[19.1994] → [3.21:88]
B:BD[14.7554] → [2.166:348]
BD:BD[14.7554] → [2.166:348]
```
end
function App.run_tests(record_error_fn)
  local globals = App.shallow_copy_all_globals()
  App = App_for_tests
  local saved_font = love.graphics.getFont()
  love.graphics.setFont(Love_snapshot.initial_font)
--?     print('=== '..name)
    xpcall(_G[name], function(err) record_error_fn(name, err) end)
  love.graphics.setFont(saved_font)
  -- restore all global state except Test_errors
  local test_errors = Test_errors
  App.restore_all_globals(globals)
  Test_errors = test_errors
```

Replacement in app.lua at line 421 [10.2]

B:BD[20.41] → [21.18:63]

B:BD[21.63] → [2.349:398]

∅:D[2.398] → [20.93:115]

B:BD[20.93] → [20.93:115]

B:BD[20.115] → [2.399:769]

function App.run_test(test, record_error_fn)
  local globals = App.shallow_copy_all_globals()
  App = App_for_tests
  local saved_font = love.graphics.getFont()
  love.graphics.setFont(Love_snapshot.initial_font)
    App.initialize_for_test()
    xpcall(test, function(err) record_error_fn('', err) end)
  love.graphics.setFont(saved_font)
  -- restore all global state except Test_errors
  local test_errors = Test_errors
  App.restore_all_globals(globals)
  Test_errors = test_errors

[20.41]

[2.769]

function colortable(app_color)
  return {app_color.r, app_color.g, app_color.b, app_color.a}

Deletion in app.lua at line 444 [10.2]

B:BD[12.1472] → [13.5199:5292]

function colortable(app_color)
  return {app_color.r, app_color.g, app_color.b, app_color.a}

Solving an order conflict in app.lua at line 444 [10.2]
[2.1126]
[14.7564]

resolve conflicts

Dependencies

In channels

Change contents

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

Insertion in reference.md at line 67 [8.17]

Solving an order conflict in reference.md at line 69 [8.17]

Insertion in reference.md at line 69 [8.17]

Insertion in reference.md at line 75 [8.17]

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

Insertion in reference.md at line 87 [8.17]

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

Solving an order conflict in reference.md at line 89 [8.17]

Insertion in reference.md at line 89 [8.17]

Insertion in reference.md at line 93 [8.17]

Insertion in reference.md at line 117 [8.17]

Solving an order conflict in reference.md at line 119 [8.17]

Insertion in reference.md at line 119 [8.17]

Insertion in reference.md at line 121 [8.17]

Replacement in app.lua at line 134 [10.2]