akkartik/pong.love - Change B7PIB4ULPBQMXT5KYHPTVQW4LLBQPSR6T55VMNGW4EXEJ2RC2WRQC

resolve conflicts

Created by akkartik on February 8, 2024

B7PIB4ULPBQMXT5KYHPTVQW4LLBQPSR6T55VMNGW4EXEJ2RC2WRQC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 462 [6.2]

B:BD[5.19839] → [5.19839:19879]

  -- cursor moves to end of screen line

[5.19839]

[5.19879]

  -- cursor moves to end of screen line (one more than final character shown)

Replacement in text_tests.lua at line 464 [6.2]

B:BD[5.19935] → [5.19935:19990]

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

[5.19935]

[5.19990]

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

Replacement in text_tests.lua at line 483 [6.2]

B:BD[5.20725] → [5.20725:20765]

  -- cursor moves to end of screen line

[5.20725]

[5.20765]

  -- cursor moves to end of screen line (one more than final character shown)

Replacement in text_tests.lua at line 485 [6.2]

B:BD[5.20821] → [5.20821:20876]

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

[5.20821]

[5.20876]

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

Replacement in text_tests.lua at line 553 [6.2]

B:BD[5.23752] → [5.23752:23843]

  -- cursor moves to end of screen line
  check_eq(Editor_state.cursor1.pos, 20, 'cursor')

[5.23752]

[5.23843]

  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 21, 'cursor')

Deletion in text_tests.lua at line 2055 [6.2]
B:BD[7.41621] → [3.4473:4473]
B:BD[8.1263] → [9.0:78]
BD:BD[8.1263] → [9.0:78]
BD:BD[8.1263] → [9.0:78]
B:BD[12.3550] → [9.79:134]
BD:BD[12.3550] → [9.79:134]
BD:BD[12.3550] → [9.79:134]
B:BD[8.1334] → [9.135:213]
BD:BD[8.1334] → [9.135:213]
BD:BD[8.1334] → [9.135:213]
B:BD[12.3716] → [9.214:269]
BD:BD[12.3716] → [9.214:269]
BD:BD[12.3716] → [9.214:269]
B:BD[8.1547] → [9.270:399]
BD:BD[8.1547] → [9.270:399]
BD:BD[8.1547] → [9.270:399]
```
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 21, 'cursor')
```
Solving an order conflict in text_tests.lua at line 2055 [6.2]
[7.41621]

Replacement in text.lua at line 665 [14.1]

B:BD[5.107742] → [5.107742:107816]

        return line_cache.screen_line_starting_pos[screen_line_index+1]-1

[5.107742]

[5.107816]

        return line_cache.screen_line_starting_pos[screen_line_index+1]

Deletion in text.lua at line 957 [14.1]
B:BD[5.115545] → [15.2720:2720]
B:BD[16.1535] → [9.400:472]
BD:BD[16.1535] → [9.400:472]
```
        return line_cache.screen_line_starting_pos[screen_line_index+1]
```
Solving an order conflict in text.lua at line 957 [14.1]
[5.115545]

Replacement in source_text_tests.lua at line 488 [17.3561]

B:BD[10.22685] → [10.22685:22725]

  -- cursor moves to end of screen line

[10.22685]

[11.2973]

  -- cursor moves to end of screen line (one more than final character shown)

Replacement in source_text_tests.lua at line 490 [17.3561]

B:BD[11.3029] → [11.3029:3084]

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

[11.3029]

[10.22900]

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

Replacement in source_text_tests.lua at line 509 [17.3561]

B:BD[10.23789] → [10.23789:23829]

  -- cursor moves to end of screen line

[10.23789]

[11.3139]

  -- cursor moves to end of screen line (one more than final character shown)

Replacement in source_text_tests.lua at line 511 [17.3561]

B:BD[11.3195] → [11.3195:3250]

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

[11.3195]

[10.24082]

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

Replacement in source_text_tests.lua at line 579 [17.3561]

B:BD[10.27601] → [10.27601:27641]

B:BD[10.27641] → [11.3841:3892]

  -- cursor moves to end of screen line
  check_eq(Editor_state.cursor1.pos, 20, 'cursor')

[10.27601]

[18.729]

  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 21, 'cursor')

Deletion in source_text_tests.lua at line 2152 [17.3561]
B:BD[19.1303] → [20.992:992]
B:BD[17.22860] → [4.7:85]
BD:BD[17.22860] → [4.7:85]
BD:BD[17.22860] → [4.7:85]
B:BD[22.3556] → [4.86:141]
BD:BD[22.3556] → [4.86:141]
BD:BD[22.3556] → [4.86:141]
B:BD[17.23964] → [4.142:220]
BD:BD[17.23964] → [4.142:220]
BD:BD[17.23964] → [4.142:220]
B:BD[22.3722] → [4.221:276]
BD:BD[22.3722] → [4.221:276]
BD:BD[22.3722] → [4.221:276]
B:BD[17.27776] → [4.277:406]
BD:BD[17.27776] → [4.277:406]
BD:BD[17.27776] → [4.277:406]
```
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 21, 'cursor')
```
Solving an order conflict in source_text_tests.lua at line 2152 [17.3561]
[19.1303]

Replacement in source_text.lua at line 801 [17.83786]

B:BD[2.12915] → [2.12915:12989]

        return line_cache.screen_line_starting_pos[screen_line_index+1]-1

[2.12915]

[2.12989]

        return line_cache.screen_line_starting_pos[screen_line_index+1]

Deletion in source_text.lua at line 1099 [17.83786]
B:BD[17.134978] → [4.408:480]
BD:BD[17.134978] → [4.408:480]
```
        return line_cache.screen_line_starting_pos[screen_line_index+1]
```
Solving an order conflict in source_text.lua at line 1099 [17.83786]
[2.21703]

resolve conflicts

Dependencies

In channels

Change contents

Replacement in text_tests.lua at line 462 [6.2]

Replacement in text_tests.lua at line 464 [6.2]

Replacement in text_tests.lua at line 483 [6.2]

Replacement in text_tests.lua at line 485 [6.2]

Replacement in text_tests.lua at line 553 [6.2]

Deletion in text_tests.lua at line 2055 [6.2]

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

Replacement in text.lua at line 665 [14.1]

Deletion in text.lua at line 957 [14.1]

Solving an order conflict in text.lua at line 957 [14.1]

Replacement in source_text_tests.lua at line 488 [17.3561]

Replacement in source_text_tests.lua at line 490 [17.3561]

Replacement in source_text_tests.lua at line 509 [17.3561]

Replacement in source_text_tests.lua at line 511 [17.3561]

Replacement in source_text_tests.lua at line 579 [17.3561]

Deletion in source_text_tests.lua at line 2152 [17.3561]

Solving an order conflict in source_text_tests.lua at line 2152 [17.3561]

Replacement in source_text.lua at line 801 [17.83786]

Deletion in source_text.lua at line 1099 [17.83786]

Solving an order conflict in source_text.lua at line 1099 [17.83786]