akkartik/pong.love - Change DF2YX6737MBU7KDIOQCWAWG4CTPYR6BWVVDW3EYZVC7QC5XOYUKAC

resolve conflicts

When did pong bring back edit.lua and text.lua and whatnot? Lots of dead code here. Anyways..

Created by akkartik on December 6, 2024

DF2YX6737MBU7KDIOQCWAWG4CTPYR6BWVVDW3EYZVC7QC5XOYUKAC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 296 [6.2]
B:BD[4.14350] → [5.225:263]
```
function test_click_below_all_lines()
```
[4.14350]
[5.263]
```
function test_click_below_final_line_of_file()
```

Replacement in text_tests.lua at line 308 [6.2]

B:BD[5.736] → [5.736:812]

  -- cursor doesn't move
  check_eq(Editor_state.cursor1.line, 1, 'cursor')

[5.736]

[5.812]

  -- cursor goes to bottom
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')

Deletion in text_tests.lua at line 1953 [6.2]

B:BD[7.41617] → [2.3:3]

B:BD[8.280] → [9.0:47]

BD:BD[8.280] → [9.0:47]

B:BD[8.791] → [9.48:185]

BD:BD[8.791] → [9.48:185]

function test_click_below_final_line_of_file()
  -- cursor goes to bottom
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')

Solving an order conflict in text_tests.lua at line 1953 [6.2]
[7.41617]
[10.2]
Replacement in source_text_tests.lua at line 322 [12.3561]
B:BD[11.16182] → [5.1174:1212]
```
function test_click_below_all_lines()
```
[11.16182]
[5.1212]
```
function test_click_below_final_line_of_file()
```

Replacement in source_text_tests.lua at line 334 [12.3561]

B:BD[5.1685] → [5.1685:1761]

  -- cursor doesn't move
  check_eq(Editor_state.cursor1.line, 1, 'cursor')

[5.1685]

[5.1761]

  -- cursor goes to bottom
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')

Deletion in source_text_tests.lua at line 2105 [12.3561]

B:BD[13.285] → [3.7:54]

BD:BD[13.285] → [3.7:54]

B:BD[13.796] → [3.55:192]

BD:BD[13.796] → [3.55:192]

function test_click_below_final_line_of_file()
  -- cursor goes to bottom
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')

Solving an order conflict in source_text_tests.lua at line 2105 [12.3561]
[2.18]

resolve conflicts

Dependencies

In channels

Change contents

Replacement in text_tests.lua at line 296 [6.2]

Replacement in text_tests.lua at line 308 [6.2]

Deletion in text_tests.lua at line 1953 [6.2]

Solving an order conflict in text_tests.lua at line 1953 [6.2]

Replacement in source_text_tests.lua at line 322 [12.3561]

Replacement in source_text_tests.lua at line 334 [12.3561]

Deletion in source_text_tests.lua at line 2105 [12.3561]

Solving an order conflict in source_text_tests.lua at line 2105 [12.3561]