akkartik/wardley.love - Change OAMKQIRSXVKW5ZNOHWZVQ7IT2T3KXRCV3VUJZIEGWKYYT7I323BAC

resolve conflicts

Created by akkartik on September 17, 2023

OAMKQIRSXVKW5ZNOHWZVQ7IT2T3KXRCV3VUJZIEGWKYYT7I323BAC

Dependencies

In channels

main

Change contents

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[6.2] → [7.165725:165764]

BFD:BFD[7.165764] → [7.152440:152440]

B:BD[8.205] → [4.0:37]

B:BD[9.301] → [4.38:466]

B:BD[10.112] → [3.0:218]

∅:D[3.218] → [10.309:315]

∅:D[4.466] → [8.567:714]

∅:D[4.37] → [8.250:391]

B:BD[8.391] → [5.0:36]

∅:D[5.36] → [10.0:45]

      or edit.invalid_cursor1(State)
end
-- cursor loc in particular differs from other locs in one way:
-- pos might occur just after end of line
function edit.invalid_cursor1(State)
  local cursor1 = State.cursor1
  if cursor1.line > #State.lines then return true end
  local l = State.lines[cursor1.line]
  if l.mode ~= 'text' then return false end  -- pos is irrelevant to validity for a drawing line
  return cursor1.pos > #State.lines[cursor1.line].data + 1
    if State.cursor1.line >= #State.lines then
      break
    end
    if State.lines[State.cursor1.line].mode == 'text' then
      break
    end
    State.cursor1.line = State.cursor1.line+1
    State.cursor1.pos = 1
  end
end
function edit.cursor_on_text(State)
  return State.cursor1.line <= #State.lines
      and State.lines[State.cursor1.line].mode == 'text'
end
      or not edit.cursor_on_text(State)
      or not Text.le1(State.screen_top1, State.cursor1) then
    State.screen_top1 = {line=1, pos=1}
    State.cursor1 = {line=1, pos=1}
    edit.put_cursor_on_next_text_line(State)

Replacement in source_edit.lua at line 114 [12.152503]
B:BD[11.205] → [11.205:250]
```
      or edit.invalid1(State, State.cursor1)
```
[11.205]
[11.250]
```
      or edit.invalid_cursor1(State)
```
Insertion in source_edit.lua at line 118 [12.152503]
[11.391]
[2.330]
```
    State.cursor1 = {line=1, pos=1}
```

Insertion in source_edit.lua at line 130 [12.152503]

[11.572]

-- cursor loc in particular differs from other locs in one way:
-- pos might occur just after end of line
function edit.invalid_cursor1(State)
  local cursor1 = State.cursor1
  if cursor1.line > #State.lines then return true end
  local l = State.lines[cursor1.line]
  if l.mode ~= 'text' then return false end  -- pos is irrelevant to validity for a drawing line
  return cursor1.pos > #State.lines[cursor1.line].data + 1
end

Replacement in source_edit.lua at line 147 [12.152503]

B:BD[2.442] → [2.442:644]

  if State.cursor1.line >= #State.lines then
    break
  end
  if State.lines[State.cursor1.line].mode == 'text' then
    break
  end
  State.cursor1.line = State.cursor1.line+1
  State.cursor1.pos = 1

[2.442]

[13.18427]

    if State.cursor1.line >= #State.lines then
      break
    end
    if State.lines[State.cursor1.line].mode == 'text' then
      break
    end
    State.cursor1.line = State.cursor1.line+1
    State.cursor1.pos = 1

Deletion in edit.lua at line 79 [15.413]
B:BD[14.472] → [11.919:955]
B:BD[11.955] → [2.1318:1318]
```
    State.cursor1 = {line=1, pos=1}
```
Resurrecting zombie bytes in edit.lua at line 79 [15.413]
B:B[14.472] → [5.37:73]
BD:B[14.472] → [5.37:73]
```
    State.cursor1 = {line=1, pos=1}
```

Deletion in edit.lua at line 100 [15.413]

B:BD[10.428] → [3.219:437]

BD:BD[10.428] → [3.219:437]

    if State.cursor1.line >= #State.lines then
      break
    end
    if State.lines[State.cursor1.line].mode == 'text' then
      break
    end
    State.cursor1.line = State.cursor1.line+1
    State.cursor1.pos = 1

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_edit.lua, source_edit.lua

Replacement in source_edit.lua at line 114 [12.152503]

Insertion in source_edit.lua at line 118 [12.152503]

Insertion in source_edit.lua at line 130 [12.152503]

Replacement in source_edit.lua at line 147 [12.152503]

Deletion in edit.lua at line 79 [15.413]

Resurrecting zombie bytes in edit.lua at line 79 [15.413]

Deletion in edit.lua at line 100 [15.413]