akkartik/wardley.love - Change MEINLCTPD74BWPDTPU6HWMGOZGCQRSEVTZBUBXJTYJ2XIHJZP4VAC

resolve conflicts

Created by akkartik on October 9, 2023

MEINLCTPD74BWPDTPU6HWMGOZGCQRSEVTZBUBXJTYJ2XIHJZP4VAC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[5.2] → [6.83676:83721]

BFD:BFD[6.83721] → [6.3498:3498]

B:BD[6.35876] → [3.491:809]

B:BD[6.73266] → [3.810:925]

B:BD[7.41413] → [3.926:981]

∅:D[3.981] → [6.73630:73675]

∅:D[3.925] → [6.73379:73403]

∅:D[3.809] → [6.35980:36025]

  if Version == '12.0' then
    -- HACK: Maybe v12.0 uses a different font? Strange that it only causes
    -- issues in a couple of places.
    -- We'll need to rethink our tests if issues like this start to multiply.
    App.screen.check(y, 'mno ', 'screen:3')
  else
    App.screen.check(y, 'mn', 'screen:3')
  end
  edit.run_after_mouse_release(Editor_state, Editor_state.left+2,Editor_state.top+Editor_state.line_height*2+5, 1)
  check_eq(Editor_state.cursor1.pos, 25, 'cursor:pos')
end
function test_backspace_can_scroll_up()
  -- cursor should move
end
function test_pagedown_never_moves_up()

Replacement in source_text_tests.lua at line 1089 [8.3561]

B:BD[8.35939] → [9.6:46]

  App.screen.check(y, 'mn', 'screen:3')

[8.35939]

[8.36043]

  if Version == '12.0' then
    -- HACK: Maybe v12.0 uses a different font? Strange that it only causes
    -- issues in a couple of places.
    -- We'll need to rethink our tests if issues like this start to multiply.
    App.screen.check(y, 'mno ', 'screen:3')
  else
    App.screen.check(y, 'mn', 'screen:3')
  end

Replacement in source_text_tests.lua at line 1806 [8.3561]

B:BD[8.73329] → [10.13209:13324]

  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height*2+5, 1)

[8.73329]

[8.73442]

  edit.run_after_mouse_release(Editor_state, Editor_state.left+2,Editor_state.top+Editor_state.line_height*2+5, 1)

Replacement in source_text_tests.lua at line 1809 [8.3561]

B:BD[11.18053] → [11.18053:18108]

  check_eq(Editor_state.cursor1.pos, 26, 'cursor:pos')

[11.18053]

[8.73693]

  check_eq(Editor_state.cursor1.pos, 25, 'cursor:pos')

Deletion in main.lua at line 154 [13.2]

B:BD[12.1373] → [8.187783:187951]

B:BD[8.187951] → [14.46:46]

  if Current_app == 'run' then
    run.draw()
  elseif Current_app == 'source' then
    source.draw()
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end

Resurrecting zombie bytes in main.lua at line 154 [13.2]

B:B[12.1373] → [4.757:1023]

BD:B[12.1373] → [4.757:1023]

  if Current_app == 'error' then
    love.graphics.setColor(0,0,1)
    love.graphics.rectangle('fill', 0,0, App.screen.width, App.screen.height)
    love.graphics.setColor(1,1,1)
    love.graphics.printf(Error_message, 40,40, 600)
  elseif Current_app == 'run' then

Insertion in main.lua at line 160 [13.2]

[4.1023]

[13.416]

    run.draw()
  elseif Current_app == 'source' then
    source.draw()
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end

Insertion in main.lua at line 231 [13.2]
[12.1512]
[8.189334]
```
  if Current_app == 'error' then return end
```
Deletion in main.lua at line 233 [13.2]
B:BD[8.189406] → [15.469:469]
B:BD[12.1512] → [4.1160:1204]
BD:BD[12.1512] → [4.1160:1204]
```
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 233 [13.2]
[8.189406]
[16.620]
Insertion in main.lua at line 247 [13.2]
[17.57]
[18.71]
```
  if Current_app == 'error' then return end
```
Insertion in main.lua at line 263 [13.2]
[8.190074]
[8.190074]
```
  if Current_app == 'error' then return end
```
Deletion in main.lua at line 269 [13.2]
B:BD[18.355] → [19.842:842]
B:BD[6.190979] → [4.1295:1339]
BD:BD[6.190979] → [4.1295:1339]
```
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 269 [13.2]
[18.355]
[20.823]
Resurrecting zombie bytes in main.lua at line 275 [13.2]
B:B[20.925] → [4.1340:1384]
BD:B[20.925] → [4.1340:1384]
```
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 275 [13.2]
[19.889]
[4.1340]
Insertion in main.lua at line 286 [13.2]
[19.1071]
[8.190430]
```
  if Current_app == 'error' then return end
```
Deletion in main.lua at line 293 [13.2]
B:BD[8.190711] → [14.64:64]
B:BD[6.191282] → [4.1385:1429]
BD:BD[6.191282] → [4.1385:1429]
```
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 293 [13.2]
[8.190711]
[21.235]
Insertion in main.lua at line 297 [13.2]
[8.190738]
[8.190738]
```
  if Current_app == 'error' then return end
```
Deletion in main.lua at line 315 [13.2]
B:BD[21.268] → [22.187:187]
B:BD[17.57] → [4.1205:1249]
BD:BD[17.57] → [4.1205:1249]
```
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 315 [13.2]
[21.268]
Insertion in app.lua at line 11 [23.2]
[23.54]
[8.209221]
```
  App.version_check()
```
Deletion in app.lua at line 13 [23.2]
B:BD[8.209243] → [14.84:84]
B:BD[23.54] → [4.1430:1452]
BD:BD[23.54] → [4.1430:1452]
```
  App.version_check()
```
Solving an order conflict in app.lua at line 13 [23.2]
[8.209243]
[12.2266]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

Replacement in source_text_tests.lua at line 1089 [8.3561]

Replacement in source_text_tests.lua at line 1806 [8.3561]

Replacement in source_text_tests.lua at line 1809 [8.3561]

Deletion in main.lua at line 154 [13.2]

Resurrecting zombie bytes in main.lua at line 154 [13.2]

Insertion in main.lua at line 160 [13.2]

Insertion in main.lua at line 231 [13.2]

Deletion in main.lua at line 233 [13.2]

Solving an order conflict in main.lua at line 233 [13.2]

Insertion in main.lua at line 247 [13.2]

Insertion in main.lua at line 263 [13.2]

Deletion in main.lua at line 269 [13.2]

Solving an order conflict in main.lua at line 269 [13.2]

Resurrecting zombie bytes in main.lua at line 275 [13.2]

Solving an order conflict in main.lua at line 275 [13.2]

Insertion in main.lua at line 286 [13.2]

Deletion in main.lua at line 293 [13.2]

Solving an order conflict in main.lua at line 293 [13.2]

Insertion in main.lua at line 297 [13.2]

Deletion in main.lua at line 315 [13.2]

Solving an order conflict in main.lua at line 315 [13.2]

Insertion in app.lua at line 11 [23.2]

Deletion in app.lua at line 13 [23.2]

Solving an order conflict in app.lua at line 13 [23.2]