akkartik/driver.love - Change QRIXWLCQUQWGIUZ5FHRLDZP5XQEVTPWKUDYC5ZOABC7TFFHRODNQC

resolve conflicts

Created by akkartik on November 18, 2023

QRIXWLCQUQWGIUZ5FHRLDZP5XQEVTPWKUDYC5ZOABC7TFFHRODNQC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 24 [8.1]
B:BD[6.52] → [7.228:228]
BD:BD[6.52] → [7.228:228]
Resurrecting zombie bytes in text.lua at line 24 [8.1]
B:B[9.63] → [5.532:623]
BD:B[9.63] → [5.532:623]
```
  assert(#line_cache.screen_line_starting_pos >= 1, 'line cache missing screen line info')
```
Solving an order conflict in text.lua at line 24 [8.1]
[6.52]
[5.532]

Resurrecting zombie bytes in text.lua at line 236 [8.1]

B:B[10.122] → [5.702:916]

BD:B[10.122] → [5.702:916]

    assert(Text.le1(State.screen_top1, State.cursor1), ('screen_top (line=%d,pos=%d) is below cursor (line=%d,pos=%d)'):format(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos))

Replacement in edit.lua at line 252 [12.413]

B:BD[11.325] → [4.15:40]

  assert(State.cursor_x)

[11.325]

  assert(State.cursor_x, 'tried to process key press when cursor is not within viewport')

Replacement in app.lua at line 320 [13.2]

B:BD[3.248] → [3.248:286]

    print(obj.type)
    assert(false)

[3.248]

[14.6415]

    assert(false, ("App.screen.draw can't yet handle many types in tests, including %s"):format(obj.type))