akkartik/pong.love - Change MYQNSDA3BKAVX3AKPKUDVFOL7B2O53O7U75B6Y673HJZGOULFBYAC

resolve conflicts

Created by akkartik on December 29, 2023

MYQNSDA3BKAVX3AKPKUDVFOL7B2O53O7U75B6Y673HJZGOULFBYAC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua

BFD:BFD[7.2] → [8.177715:177749]

BFD:BFD[8.177749] → [8.165829:165829]

B:BD[8.168531] → [6.327:386]

B:BD[8.169531] → [6.387:559]

B:BD[8.170085] → [6.560:610]

B:BD[10.51] → [6.611:789]

∅:D[6.789] → [11.2008:2044]

∅:D[6.610] → [10.13:51]

∅:D[6.559] → [8.169662:169706]

∅:D[6.386] → [12.72:364]

  local font = love.graphics.newFont(settings.font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))
  local font = love.graphics.newFont(font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
  Editor_state.filename = 'run.lua'
  source.initialize_window_geometry()
  Editor_state.filename = settings.filename
  -- set up desired window dimensions and make window resizable
  _, _, App.screen.flags = App.screen.size()
  App.screen.flags.resizable = true
  App.screen.width, App.screen.height = settings.width, settings.height
  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)

File deletion: run.lua, run.lua

BFD:BFD[7.2] → [8.183867:183898]

BFD:BFD[8.183898] → [8.178107:178107]

B:BD[8.179231] → [6.794:853]

B:BD[12.1858] → [6.854:1015]

B:BD[8.180226] → [6.1016:1066]

B:BD[10.137] → [6.1067:1210]

∅:D[6.1210] → [8.180605:180638]

∅:D[6.1066] → [10.102:137]

∅:D[6.1015] → [8.180019:180158]

∅:D[6.853] → [12.1698:1807]

∅:D[12.1807] → [8.179554:179590]

  local font = love.graphics.newFont(Settings.font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, Settings.font_height, math.floor(Settings.font_height*1.3))
  local font = love.graphics.newFont(font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
  Settings = run.settings()
end
  run.initialize_window_geometry()
  Editor_state.filename = Settings.filename
  Editor_state.screen_top1 = Settings.screen_top
  Editor_state.cursor1 = Settings.cursor
end
  -- set up desired window dimensions and make window resizable
  _, _, App.screen.flags = App.screen.size()
  App.screen.flags.resizable = true

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[7.2] → [8.202684:202723]

BFD:BFD[8.202723] → [8.191243:191243]

B:BD[8.191636] → [6.1381:1594]

∅:D[6.1594] → [8.191830:192064]

  Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font, Editor_state.font_height, Editor_state.line_height)
  Log_browser_state.filename = 'log'
  load_from_disk(Log_browser_state)  -- TODO: pay no attention to Fold
  log_browser.parse(Log_browser_state)
  Text.redraw_all(Log_browser_state)
  Log_browser_state.screen_top1 = {line=1, pos=1}

Deletion in source_edit.lua at line 28 [8.152503]

B:BD[14.145065] → [14.145065:145206]

B:BD[14.145206] → [15.7212:7212]

function edit.initialize_state(top, left, right, font_height, line_height)  -- currently always draws to bottom of screen
  local result = {

Resurrecting zombie bytes in source_edit.lua at line 28 [8.152503]

B:B[8.152909] → [6.12:140]

BD:B[8.152909] → [6.12:140]

function edit.initialize_state(top, left, right, font, font_height, line_height)  -- currently always draws to bottom of screen

Solving an order conflict in source_edit.lua at line 28 [8.152503]
[14.145065]
[6.12]
Insertion in source_edit.lua at line 29 [8.152503]
[6.140]
[17.7967]
```
  local result = {
```
Insertion in source_edit.lua at line 88 [8.152503]
[14.146816]
[14.146816]
```
    font = font,
```
Replacement in source_edit.lua at line 109 [8.152503]
B:BD[14.147332] → [14.147332:147361]
```
end  -- App.initialize_state
```
[14.147332]
[14.147361]
```
end  -- edit.initialize_state
```
Deletion in source_edit.lua at line 111 [8.152503]
B:BD[14.147362] → [9.345:345]
B:BD[19.18272] → [6.141:158]
BD:BD[19.18272] → [6.141:158]
B:BD[8.155383] → [6.159:189]
BD:BD[8.155383] → [6.159:189]
```
    font = font,
end  -- edit.initialize_state
```
Solving an order conflict in source_edit.lua at line 111 [8.152503]
[14.147362]
[20.11]
Insertion in source_edit.lua at line 161 [8.152503]
[14.147418]
[14.147418]
```
  love.graphics.setFont(State.font)
```
Deletion in source_edit.lua at line 173 [8.152503]
B:BD[15.7423] → [13.3651:3651]
B:BD[8.155468] → [6.190:226]
BD:BD[8.155468] → [6.190:226]
```
  love.graphics.setFont(State.font)
```
Solving an order conflict in source_edit.lua at line 173 [8.152503]
[15.7423]
[14.147898]

Replacement in source_edit.lua at line 557 [8.152503]

B:BD[14.155202] → [21.8:74]

  love.graphics.setFont(love.graphics.newFont(State.font_height))

[14.155202]

[14.155275]

  State.font = love.graphics.newFont(State.font_height)

Replacement in source_edit.lua at line 574 [8.152503]
∅:D[22.212] → [14.155677:155731]
B:BD[14.155677] → [14.155677:155731]
```
      14,  -- font height assuming default LÖVE font
```
[22.212]
[14.155731]
```
      love.graphics.getFont(),
      14,
```
Deletion in source_edit.lua at line 624 [8.152503]
B:BD[14.156934] → [3.76:76]
B:BD[8.164055] → [6.227:283]
BD:BD[8.164055] → [6.227:283]
B:BD[23.557] → [6.284:325]
BD:BD[23.557] → [6.284:325]
BD:BD[23.557] → [6.284:325]
```
  State.font = love.graphics.newFont(State.font_height)
      love.graphics.getFont(),
      14,
```
Solving an order conflict in source_edit.lua at line 624 [8.152503]
[14.156934]

Replacement in source.lua at line 112 [25.5]

∅:D[24.80] → [25.3425:3494]

B:BD[25.3425] → [25.3425:3494]

  love.graphics.setFont(love.graphics.newFont(settings.font_height))

[24.80]

[26.72]

  local font = love.graphics.newFont(settings.font_height)

Replacement in source.lua at line 124 [25.5]

B:BD[27.194] → [28.167:333]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, settings.font_height, math.floor(settings.font_height*1.3))

[27.194]

[25.4243]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))

Replacement in source.lua at line 150 [25.5]

B:BD[25.4453] → [25.4453:4513]

  love.graphics.setFont(love.graphics.newFont(font_height))

[25.4453]

[29.13]

  local font = love.graphics.newFont(font_height)

Replacement in source.lua at line 152 [25.5]

B:BD[29.51] → [28.334:464]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right)

[29.51]

[15.13450]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))

Deletion in source.lua at line 154 [25.5]
∅:D[30.1005] → [25.4714:4812]
∅:D[15.13487] → [25.4714:4812]
B:BD[25.4714] → [25.4714:4812]
```
  Editor_state.font_height = font_height
  Editor_state.line_height = math.floor(font_height*1.3)
```

Replacement in log_browser.lua at line 9 [32.5]

B:BD[25.16349] → [31.857:1051]

  Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font_height, Editor_state.line_height)

[31.856]

[31.1051]

  Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font, Editor_state.font_height, Editor_state.line_height)

Replacement in edit.lua at line 13 [34.413]

B:BD[33.130030] → [33.130030:130152]

function edit.initialize_state(top, left, right, font_height, line_height)  -- currently always draws to bottom of screen

[33.130030]

[33.130152]

function edit.initialize_state(top, left, right, font, font_height, line_height)  -- currently always draws to bottom of screen

Insertion in edit.lua at line 50 [34.413]
[33.131891]
[33.131891]
```
    font = font,
```
Replacement in edit.lua at line 71 [34.413]
B:BD[33.132362] → [33.132362:132391]
```
end  -- App.initialize_state
```
[33.132362]
[33.132391]
```
end  -- edit.initialize_state
```
Deletion in edit.lua at line 101 [34.413]
B:BD[33.142371] → [2.29:29]
B:BD[34.596] → [35.1167:1295]
BD:BD[34.596] → [35.1167:1295]
B:BD[34.3321] → [36.1441:1458]
BD:BD[34.3321] → [36.1441:1458]
B:BD[37.98042] → [36.1495:1525]
BD:BD[37.98042] → [36.1495:1525]
```
function edit.initialize_state(top, left, right, font, font_height, line_height)  -- currently always draws to bottom of screen
    font = font,
end  -- edit.initialize_state
```
Solving an order conflict in edit.lua at line 101 [34.413]
[33.142371]
[38.34]
Deletion in edit.lua at line 389 [34.413]
B:BD[38.10509] → [38.10509:10575]
BD:BD[38.10509] → [38.10509:10575]
```
  love.graphics.setFont(love.graphics.newFont(State.font_height))
```

Resurrecting zombie bytes in edit.lua at line 390 [34.413]

∅:∅[6.1696] → [38.10575:11061]

B:B[38.10575] → [38.10575:11061]

BD:B[38.10575] → [38.10575:11061]

  State.line_height = math.floor(font_height*1.3)
end
--== some methods for tests
-- Insulate tests from some key globals so I don't have to change the vast
-- majority of tests when they're modified for the real app.
Test_margin_left = 25
Test_margin_right = 0
function edit.initialize_test_state()
  -- if you change these values, tests will start failing
  return edit.initialize_state(
      15,  -- top margin
      Test_margin_left,
      App.screen.width - Test_margin_right,

Deletion in edit.lua at line 406 [34.413]
B:BD[38.11061] → [38.11061:11115]
BD:BD[38.11061] → [38.11061:11115]
```
      14,  -- font height assuming default LÖVE font
```

Resurrecting zombie bytes in edit.lua at line 408 [34.413]

∅:∅[6.1738] → [38.11115:12430]

B:B[38.11115] → [38.11115:12430]

BD:B[38.11115] → [38.11115:12430]

      15)  -- line height
end
-- all text_input events are also keypresses
-- TODO: handle chords of multiple keys
function edit.run_after_text_input(State, t)
  edit.keychord_press(State, t)
  edit.text_input(State, t)
  edit.key_release(State, t)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
-- not all keys are text_input
function edit.run_after_keychord(State, chord)
  edit.keychord_press(State, chord)
  edit.key_release(State, chord)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_click(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)
  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_press(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_release(State, x,y, mouse_button)
  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end

Deletion in edit.lua at line 456 [34.413]
B:BD[38.12430] → [6.1740:1740]
B:BD[36.1458] → [35.1296:1327]
BD:BD[36.1458] → [35.1296:1327]
```
    font_height = font_height,
```
Solving an order conflict in edit.lua at line 456 [34.413]
[38.12430]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

File deletion: log_browser.lua, log_browser.lua

Deletion in source_edit.lua at line 28 [8.152503]

Resurrecting zombie bytes in source_edit.lua at line 28 [8.152503]

Solving an order conflict in source_edit.lua at line 28 [8.152503]

Insertion in source_edit.lua at line 29 [8.152503]

Insertion in source_edit.lua at line 88 [8.152503]

Replacement in source_edit.lua at line 109 [8.152503]

Deletion in source_edit.lua at line 111 [8.152503]

Solving an order conflict in source_edit.lua at line 111 [8.152503]

Insertion in source_edit.lua at line 161 [8.152503]

Deletion in source_edit.lua at line 173 [8.152503]

Solving an order conflict in source_edit.lua at line 173 [8.152503]

Replacement in source_edit.lua at line 557 [8.152503]

Replacement in source_edit.lua at line 574 [8.152503]

Deletion in source_edit.lua at line 624 [8.152503]

Solving an order conflict in source_edit.lua at line 624 [8.152503]

Replacement in source.lua at line 112 [25.5]

Replacement in source.lua at line 124 [25.5]

Replacement in source.lua at line 150 [25.5]

Replacement in source.lua at line 152 [25.5]

Deletion in source.lua at line 154 [25.5]

Replacement in log_browser.lua at line 9 [32.5]

Replacement in edit.lua at line 13 [34.413]

Insertion in edit.lua at line 50 [34.413]

Replacement in edit.lua at line 71 [34.413]

Deletion in edit.lua at line 101 [34.413]

Solving an order conflict in edit.lua at line 101 [34.413]

Deletion in edit.lua at line 389 [34.413]

Resurrecting zombie bytes in edit.lua at line 390 [34.413]

Deletion in edit.lua at line 406 [34.413]

Resurrecting zombie bytes in edit.lua at line 408 [34.413]

Deletion in edit.lua at line 456 [34.413]

Solving an order conflict in edit.lua at line 456 [34.413]