akkartik/bf.love - Change KKQKPGCIHAG2JESQAWEMCBTAKBDC5AVIQ6LCZ2ORQM2AUCFQYLSQC

resolve conflicts

Created by akkartik on November 18, 2023

KKQKPGCIHAG2JESQAWEMCBTAKBDC5AVIQ6LCZ2ORQM2AUCFQYLSQC

Dependencies

In channels

main

Change contents

File deletion: geom.lua

BF:BFD[7.2] → [8.37186:37218]

BF:BFD[8.37218] → [8.32720:32720]

B:BD[8.32720] → [8.32721:37185]

geom = {}
function geom.on_shape(x,y, drawing, shape)
  if shape.mode == 'freehand' then
    return geom.on_freehand(x,y, drawing, shape)
  elseif shape.mode == 'line' then
    return geom.on_line(x,y, drawing, shape)
  elseif shape.mode == 'manhattan' then
    local p1 = drawing.points[shape.p1]
    local p2 = drawing.points[shape.p2]
    if p1.x == p2.x then
      if x ~= p1.x then return false end
      local y1,y2 = p1.y, p2.y
      if y1 > y2 then
        y1,y2 = y2,y1
      end
      return y >= y1-2 and y <= y2+2
    elseif p1.y == p2.y then
      if y ~= p1.y then return false end
      local x1,x2 = p1.x, p2.x
      if x1 > x2 then
        x1,x2 = x2,x1
      end
      return x >= x1-2 and x <= x2+2
    end
  elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
    return geom.on_polygon(x,y, drawing, shape)
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    local dist = geom.dist(center.x,center.y, x,y)
    return dist > shape.radius*0.95 and dist < shape.radius*1.05
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    local dist = geom.dist(center.x,center.y, x,y)
    if dist < shape.radius*0.95 or dist > shape.radius*1.05 then
      return false
    end
    return geom.angle_between(center.x,center.y, x,y, shape.start_angle,shape.end_angle)
  elseif shape.mode == 'deleted' then
  else
    print(shape.mode)
    assert(false)
  end
end
function geom.on_freehand(x,y, drawing, shape)
  local prev
  for _,p in ipairs(shape.points) do
    if prev then
      if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then
        return true
      end
    end
    prev = p
  end
  return false
end
function geom.on_line(x,y, drawing, shape)
  local p1,p2
  if type(shape.p1) == 'number' then
    p1 = drawing.points[shape.p1]
    p2 = drawing.points[shape.p2]
  else
    p1 = shape.p1
    p2 = shape.p2
  end
  if p1.x == p2.x then
    if math.abs(p1.x-x) > 2 then
      return false
    end
    local y1,y2 = p1.y,p2.y
    if y1 > y2 then
      y1,y2 = y2,y1
    end
    return y >= y1-2 and y <= y2+2
  end
  -- has the right slope and intercept
  local m = (p2.y - p1.y) / (p2.x - p1.x)
  local yp = p1.y + m*(x-p1.x)
  if yp < y-2 or yp > y+2 then
    return false
  end
  -- between endpoints
  local k = (x-p1.x) / (p2.x-p1.x)
  return k > -0.005 and k < 1.005
end
function geom.on_polygon(x,y, drawing, shape)
  local prev
  for _,p in ipairs(shape.vertices) do
    if prev then
      if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then
        return true
      end
    end
    prev = p
  end
  return geom.on_line(x,y, drawing, {p1=shape.vertices[1], p2=shape.vertices[#shape.vertices]})
end
-- are (x3,y3) and (x4,y4) on the same side of the line between (x1,y1) and (x2,y2)
function geom.same_side(x1,y1, x2,y2, x3,y3, x4,y4)
  if x1 == x2 then
    return math.sign(x3-x1) == math.sign(x4-x1)
  end
  if y1 == y2 then
    return math.sign(y3-y1) == math.sign(y4-y1)
  end
  local m = (y2-y1)/(x2-x1)
  return math.sign(m*(x3-x1) + y1-y3) == math.sign(m*(x4-x1) + y1-y4)
end
function math.sign(x)
  if x > 0 then
    return 1
  elseif x == 0 then
    return 0
  elseif x < 0 then
    return -1
  end
end
function geom.angle_with_hint(x1, y1, x2, y2, hint)
  local result = geom.angle(x1,y1, x2,y2)
  if hint then
    -- Smooth the discontinuity where angle goes from positive to negative.
    -- The hint is a memory of which way we drew it last time.
    while result > hint+math.pi/10 do
      result = result-math.pi*2
    end
    while result < hint-math.pi/10 do
      result = result+math.pi*2
    end
  end
  return result
end
-- result is from -π/2 to 3π/2, approximately adding math.atan2 from Lua 5.3
-- (LÖVE is Lua 5.1)
function geom.angle(x1,y1, x2,y2)
  local result = math.atan((y2-y1)/(x2-x1))
  if x2 < x1 then
    result = result+math.pi
  end
  return result
end
-- is the line between x,y and cx,cy at an angle between s and e?
function geom.angle_between(ox,oy, x,y, s,e)
  local angle = geom.angle(ox,oy, x,y)
  if s > e then
    s,e = e,s
  end
  -- I'm not sure this is right or ideal..
  angle = angle-math.pi*2
  if s <= angle and angle <= e then
    return true
  end
  angle = angle+math.pi*2
  if s <= angle and angle <= e then
    return true
  end
  angle = angle+math.pi*2
  return s <= angle and angle <= e
end
function geom.dist(x1,y1, x2,y2) return ((x2-x1)^2+(y2-y1)^2)^0.5 end

File deletion: source_undo.lua, source_undo.lua

BFD:BFD[7.2] → [9.3457:3496]

BFD:BFD[9.3496] → [9.5:5]

B:BD[9.1384] → [6.2318:2379]

B:BD[9.1431] → [6.2380:2456]

B:BD[11.2209] → [6.2457:2521]

B:BD[9.2401] → [6.2522:2599]

B:BD[9.2521] → [6.2600:2685]

B:BD[9.2712] → [6.2686:2763]

B:BD[9.2837] → [6.2764:2849]

∅:D[6.2849] → [9.2888:3456]

∅:D[6.2763] → [9.2755:2837]

∅:D[6.2685] → [9.2572:2712]

∅:D[6.2599] → [9.2444:2521]

∅:D[6.2521] → [11.2252:2260]

∅:D[6.2456] → [9.1458:1787]

∅:D[6.2379] → [9.1396:1431]

  assert(s, 'failed to snapshot operation for undo history')
  assert(#State.lines > 0, 'failed to snapshot operation for undo history')
      assert(false, ('unknown line mode %s'):format(line.mode))
  assert(from.start_line == to.start_line, 'failed to patch undo operation')
  assert(#to.lines == to.end_line-to.start_line+1, 'failed to patch undo operation')
  assert(from.start_line == to.start_line, 'failed to patch undo operation')
  assert(#to.lines == to.end_line-to.start_line+1, 'failed to patch undo operation')
  for i=1,#to.lines do
    table.insert(line_cache, to.start_line+i-1, {})
  end
end
-- https://stackoverflow.com/questions/640642/how-do-you-copy-a-lua-table-by-value/26367080#26367080
function deepcopy(obj, seen)
  if type(obj) ~= 'table' then return obj end
  if seen and seen[obj] then return seen[obj] end
  local s = seen or {}
  local result = setmetatable({}, getmetatable(obj))
  s[obj] = result
  for k,v in pairs(obj) do
    result[deepcopy(k, s)] = deepcopy(v, s)
  end
  return result
end
function minmax(a, b)
  return math.min(a,b), math.max(a,b)
end
  for i=from.end_line,from.start_line,-1 do
    table.remove(line_cache, i)
  end
  for i=1,#to.lines do
    table.insert(lines, to.start_line+i-1, to.lines[i])
  end
end
function patch_placeholders(line_cache, from, to)
  for i=from.end_line,from.start_line,-1 do
    table.remove(lines, i)
  end
    end
  if s < 1 then s = 1 end
  if s > #State.lines then s = #State.lines end
  if e < 1 then e = 1 end
  if e > #State.lines then e = #State.lines end
  -- compare with App.initialize_globals
  local event = {
    screen_top=deepcopy(State.screen_top1),
    selection=deepcopy(State.selection1),
    cursor=deepcopy(State.cursor1),
  if e == nil then
    e = s
  end

File deletion: source_text.lua, source_text.lua

BFD:BFD[7.2] → [9.147062:147101]

BFD:BFD[9.147101] → [9.83723:83723]

B:BD[9.87430] → [6.2850:2941]

B:BD[9.97835] → [6.2942:3019]

B:BD[9.102856] → [6.3020:3234]

B:BD[9.109127] → [6.3235:3312]

B:BD[9.110541] → [6.3313:3392]

B:BD[9.114836] → [6.3393:3470]

B:BD[9.114995] → [6.3471:3520]

B:BD[9.120380] → [6.3521:3590]

B:BD[9.122606] → [6.3591:3701]

B:BD[9.122747] → [6.3702:3779]

B:BD[9.123998] → [6.3780:3857]

B:BD[9.125056] → [6.3858:3911]

B:BD[12.4230] → [6.3912:3965]

B:BD[11.10959] → [6.3966:4074]

B:BD[11.11422] → [6.4075:4250]

B:BD[9.130885] → [6.4251:4318]

B:BD[9.135357] → [6.4319:4368]

B:BD[9.138549] → [6.4369:4417]

B:BD[9.139373] → [6.4418:4466]

B:BD[9.140409] → [6.4467:4548]

B:BD[9.142323] → [6.4549:4635]

∅:D[6.4635] → [9.142340:142409]

∅:D[6.4548] → [9.141090:141142]

∅:D[6.4466] → [9.139389:139549]

∅:D[6.4417] → [9.138565:139373]

∅:D[6.4368] → [9.135373:135976]

∅:D[6.4318] → [9.130919:130990]

∅:D[6.4250] → [11.11507:11827]

∅:D[6.4074] → [11.11008:11230]

∅:D[6.3965] → [12.4246:4251]

∅:D[6.3911] → [9.125072:125077]

∅:D[6.3857] → [9.124163:124285]

∅:D[6.3779] → [9.122864:122940]

∅:D[6.3701] → [9.122642:122747]

∅:D[6.3590] → [9.120414:120502]

∅:D[6.3520] → [9.114995:115146]

∅:D[6.3470] → [9.114836:114995]

∅:D[6.3392] → [9.110575:111167]

∅:D[6.3312] → [9.109238:109599]

∅:D[6.3234] → [9.102911:103057]

∅:D[6.3019] → [13.523:888]

∅:D[6.2941] → [14.307:412]

  assert(#line_cache.screen_line_starting_pos >= 1, 'line cache missing screen line info')
  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')
    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))
  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')
    assert(screen_line_index > 1, 'bumped up against top screen line in line')
  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')
  assert(State.cursor1.pos, 'cursor has no pos')
    assert(State.cursor1.pos > 1, 'bumped up against start of line')
  assert(end_offset > start_offset, ('end_offset %d not > start_offset %d'):format(end_offset, start_offset))
  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')
  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')
  assert(false, ('invalid pos %d'):format(loc1.pos))
  assert(false, ('invalid pos %d'):format(loc1.pos))
    assert(State.cursor1.line == #State.lines+1, 'tried to ensure bottom line of file is text, but failed')
      assert(top2.line > 1, 'tried to snap cursor to buttom of screen but failed')
      assert(State.lines[top2.line-1].mode == 'drawing', "expected a drawing but it's not")
  assert(my >= line_cache.starty, 'failed to map y pixel to line')
  assert(false, 'failed to map y pixel to line')
  assert(false, 'failed to map x pixel to pos')
  assert(false, 'failed to map x pixel to pos')
  assert(result.screen_pos, 'failed to convert schema-1 coordinate to schema-2')
  assert(result, "Text.offset returned nil; this is likely a failure to handle utf8")
  return result
end
function Text.previous_screen_line(State, loc2)
  return result
end
function Text.to1(State, loc2)
end
function Text.x_after(s, pos)
  local offset = Text.offset(s, math.min(pos+1, #s+1))
  local s_before = s:sub(1, offset-1)
--?   print('^'..s_before..'$')
end
-- return the nearest index of line (in utf8 code points) which lies entirely
-- within x pixels of the left margin
-- result: 0 to len+1
function Text.nearest_pos_less_than(line, x)
--?   print('', '-- nearest_pos_less_than', line, x)
  local len = utf8.len(line)
  local max_x = Text.x_after(line, len)
  if x > max_x then
    return len+1
  end
  local left, right = 0, len+1
  while true do
    local curr = math.floor((left+right)/2)
    local currxmin = Text.x_after(line, curr+1)
    local currxmax = Text.x_after(line, curr+2)
--?     print('', x, left, right, curr, currxmin, currxmax)
    if currxmin <= x and x < currxmax then
      return curr
    end
    if left >= right-1 then
      return left
    end
    if currxmin > x then
      right = curr
    else
      left = curr
    end
  end
end
function Text.screen_line_width(State, line_index, i)
  local line = State.lines[line_index]
  local line_cache = State.line_cache[line_index]
  local start_pos = line_cache.screen_line_starting_pos[i]
  local start_offset = Text.offset(line.data, start_pos)
  local screen_line
  if i < #line_cache.screen_line_starting_pos then
    local past_end_pos = line_cache.screen_line_starting_pos[i+1]
    local past_end_offset = Text.offset(line.data, past_end_pos)
    screen_line = string.sub(line.data, start_offset, past_end_offset-1)
  else
    screen_line = string.sub(line.data, start_pos)
  end
  -- duplicate some logic from Text.draw
  local y = line_cache.starty
      -- We currently can't draw partial drawings, so either skip it entirely
      -- or not at all.
      local h = Drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h, State.width)
      if y - h < State.top then
        break
      end
--?       print('skipping drawing of height', h)
      y = y - h
    table.insert(State.lines, {mode='text', data=''})
    table.insert(State.line_cache, {})
  end
--?   print(y, App.screen.height, App.screen.height-State.line_height)
  if y > App.screen.height - State.line_height then
end
end
  if State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then
    State.cursor1.pos = State.cursor1.pos+1
  if State.cursor1.pos > 1 then
    State.cursor1.pos = State.cursor1.pos-1
  local curr = s:sub(start_offset, end_offset-1)
  return curr:match(pat)
end
function Text.left(State)
    if Text.match(State.lines[State.cursor1.line].data, State.cursor1.pos-1, '%s') then
  if Text.cursor_at_final_screen_line(State) then
    -- line is done, skip to next text line
--?     print('cursor at final screen line of its line')
--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)
    local new_screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos[screen_line_index-1]
    local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)
    local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)
    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1
--?     print('cursor pos is now '..tostring(State.cursor1.pos))
  end
  if Text.lt1(State.cursor1, State.screen_top1) then
--?   print('up', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
  local screen_line_starting_pos, screen_line_index = Text.pos_at_start_of_screen_line(State, State.cursor1)
  if screen_line_starting_pos == 1 then
--?     print('cursor is at first screen line of its line')
    -- line is done; skip to previous text line
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
  elseif chord == 'delete' then
  local byte_offset = Text.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)
  State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_offset-1)..t..string.sub(State.lines[State.cursor1.line].data, byte_offset)
  Text.clear_screen_line_cache(State, State.cursor1.line)
  State.cursor1.pos = State.cursor1.pos+1
  for i=1,#line_cache.screen_line_starting_pos do
    local pos = line_cache.screen_line_starting_pos[i]

File deletion: source_file.lua, source_file.lua

BFD:BFD[7.2] → [9.152399:152438]

BFD:BFD[9.152438] → [9.150241:150241]

B:BD[11.12869] → [6.5106:5156]

B:BD[11.14202] → [6.5157:5225]

B:BD[11.15474] → [6.5226:5294]

B:BD[11.16369] → [6.5295:5343]

B:BD[11.17716] → [6.5344:5412]

∅:D[6.5412] → [11.17760:17838]

∅:D[6.5343] → [11.16383:17716]

∅:D[6.5294] → [11.15518:15557]

∅:D[6.5225] → [11.14246:14473]

∅:D[6.5156] → [11.12886:14202]

    assert(line, 'drawing in file is incomplete')
      assert(false, ('unknown drawing mode %s'):format(shape.mode))
      assert(false, ('unknown drawing mode %s'):format(shape.mode))
    assert(i, 'drawing in array is incomplete')
      assert(false, ('unknown drawing mode %s'):format(shape.mode))
    end
    table.insert(drawing.shapes, shape)
  end
  return i, drawing
end
--?     print(i)
    if line == '```' then break end
    local shape = json.decode(line)
    if shape.mode == 'freehand' then
      -- no changes needed
    elseif shape.mode == 'line' or shape.mode == 'manhattan' then
      local name = shape.p1.name
      shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.p1].name = name
      name = shape.p2.name
      shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.p2].name = name
    elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
      for i,p in ipairs(shape.vertices) do
        local name = p.name
        shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)
        drawing.points[shape.vertices[i]].name = name
      end
    elseif shape.mode == 'circle' or shape.mode == 'arc' then
      local name = shape.center.name
      shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.center].name = name
    elseif shape.mode == 'deleted' then
      -- ignore
    else
    end
  end
  outfile:write('```\n')
    end
    table.insert(drawing.shapes, shape)
  end
  return drawing
end
function store_drawing(outfile, drawing)
  outfile:write('```lines\n')
  for _,shape in ipairs(drawing.shapes) do
    if shape.mode == 'freehand' then
    if line == '```' then break end
    local shape = json.decode(line)
    if shape.mode == 'freehand' then
      -- no changes needed
    elseif shape.mode == 'line' or shape.mode == 'manhattan' then
      local name = shape.p1.name
      shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.p1].name = name
      name = shape.p2.name
      shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.p2].name = name
    elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
      for i,p in ipairs(shape.vertices) do
        local name = p.name
        shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)
        drawing.points[shape.vertices[i]].name = name
      end
    elseif shape.mode == 'circle' or shape.mode == 'arc' then
      local name = shape.center.name
      shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.center].name = name
    elseif shape.mode == 'deleted' then
      -- ignore
    else

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[7.2] → [9.165725:165764]

BFD:BFD[9.165764] → [9.152440:152440]

B:BD[9.155429] → [6.5413:5774]

B:BD[11.21468] → [6.5775:5839]

∅:D[6.5839] → [9.156342:156350]

∅:D[6.5774] → [9.155694:155762]

  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))
  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))
      assert(false, ('unknown line mode %s'):format(line.mode))
    end
  State.cursor_x = nil
  State.cursor_y = nil
  local y = State.top

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[7.2] → [9.203223:203262]

BFD:BFD[9.203262] → [9.191782:191782]

B:BD[15.148] → [6.6415:6564]

B:BD[16.358] → [6.6565:6683]

∅:D[6.6683] → [9.195997:196252]

∅:D[6.6564] → [9.194864:195449]

  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))
        else assert(line.section_end, "log line has a section name, but it's neither the start nor end of a section")
          local sectiony = y+State.line_height-Section_border_padding_vertical
          love.graphics.line(xleft,y, xleft,sectiony)
          love.graphics.line(xright,y, xright,sectiony)
          love.graphics.line(xleft,sectiony, xleft+50-2,sectiony)
  local mouse_line_index = log_browser.line_index(State, App.mouse_x(), App.mouse_y())
  local y = State.top
  for line_index = State.screen_top1.line,#State.lines do
    App.color(Text_color)
    local line = State.lines[line_index]
    if y + State.line_height > App.screen.height then break end
    local height = State.line_height
    if should_show(line) then
      local xleft = render_stack_left_margin(State, line_index, line, y)
      local xright = render_stack_right_margin(State, line_index, line, y)
      if line.section_name then
        App.color(Section_border_color)

File deletion: commands.lua, commands.lua
BFD:BFD[7.2] → [9.207726:207762]
BFD:BFD[7.2] → [9.207726:207762]
BFD:BFD[9.207762] → [9.204370:204370]
B:BD[17.162] → [6.8362:8408]
∅:D[6.8408] → [17.178:285]
```
  assert(index, 'file missing from manifest')
  table.remove(File_navigation.all_candidates, index)
  table.insert(File_navigation.all_candidates, 1, s)
```
Deletion in undo.lua at line 62 [18.1]
B:BD[18.2268] → [6.139:203]
BD:BD[18.2268] → [6.139:203]
```
      assert(false, ('unknown line mode %s'):format(line.mode))
```
Solving an order conflict in undo.lua at line 62 [18.1]
[10.102]
[18.2296]

Deletion in text.lua at line 380 [21.1]

B:BD[20.816] → [6.917:994]

  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')

Resurrecting zombie bytes in text.lua at line 401 [21.1]

B:B[22.1956] → [2.3:127]

BD:B[22.1956] → [2.3:127]

    local new_screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos[screen_line_index-1]

Insertion in text.lua at line 401 [21.1]

[22.1858]

[2.3]

    assert(screen_line_index > 1, 'bumped up against top screen line in line')

Deletion in text.lua at line 405 [21.1]
B:BD[23.4427] → [2.129:129]
B:BD[22.1858] → [6.995:1074]
BD:BD[22.1858] → [6.995:1074]
```
    assert(screen_line_index > 1, 'bumped up against top screen line in line')
```
Solving an order conflict in text.lua at line 405 [21.1]
[23.4427]
[20.1139]

Deletion in text.lua at line 418 [21.1]

B:BD[20.1280] → [6.1075:1152]

  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')

Resurrecting zombie bytes in text.lua at line 487 [21.1]
B:B[24.8150] → [23.4939:5027]
BD:B[24.8150] → [23.4939:5027]
```
    if Text.match(State.lines[State.cursor1.line].data, State.cursor1.pos-1, '%s') then
```

Insertion in text.lua at line 487 [21.1]

[25.1135]

[23.4939]

    assert(State.cursor1.pos > 1, 'bumped up against start of line')

Deletion in text.lua at line 489 [21.1]
B:BD[25.1135] → [6.1203:1272]
BD:BD[25.1135] → [6.1203:1272]
```
    assert(State.cursor1.pos > 1, 'bumped up against start of line')
```
Solving an order conflict in text.lua at line 489 [21.1]
[23.5027]
[22.5221]

Deletion in text.lua at line 528 [21.1]

B:BD[20.2106] → [6.1384:1461]

  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')

Deletion in text.lua at line 552 [21.1]
B:BD[26.823] → [6.1462:1539]
BD:BD[26.823] → [6.1462:1539]
```
  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')
```
Solving an order conflict in text.lua at line 552 [21.1]
[23.5516]
[26.958]
Deletion in text.lua at line 595 [21.1]
B:BD[19.6899] → [27.4:4]
B:BD[28.2634] → [6.1648:1756]
BD:BD[28.2634] → [6.1648:1756]
```
    assert(State.cursor1.line == #State.lines+1, 'tried to ensure bottom line of file is text, but failed')
```
Solving an order conflict in text.lua at line 595 [21.1]
[19.6899]
[29.1554]

Deletion in text.lua at line 617 [21.1]

B:BD[30.776] → [6.1757:1932]

BD:BD[30.776] → [6.1757:1932]

      assert(top2.line > 1, 'tried to snap cursor to buttom of screen but failed')
      assert(State.lines[top2.line-1].mode == 'drawing', "expected a drawing but it's not")

Solving an order conflict in text.lua at line 617 [21.1]
[19.6974]
[31.875]
Deletion in text.lua at line 942 [21.1]
B:BD[32.442] → [33.59:59]
B:BD[24.79] → [6.624:701]
BD:BD[24.79] → [6.624:701]
```
  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')
```
Solving an order conflict in text.lua at line 942 [21.1]
[32.442]
Replacement in source_undo.lua at line 39 [34.68]
B:BD[34.1447] → [34.1447:1459]
```
  assert(s)
```
[34.1447]
[34.1459]
```
  assert(s, 'failed to snapshot operation for undo history')
```

Replacement in source_undo.lua at line 43 [34.68]

B:BD[34.1494] → [34.1494:1521]

  assert(#State.lines > 0)

[34.1494]

[34.1521]

  assert(#State.lines > 0, 'failed to snapshot operation for undo history')

Replacement in source_undo.lua at line 68 [34.68]

B:BD[8.759] → [8.759:802]

      print(line.mode)
      assert(false)

[8.759]

[8.802]

      assert(false, ('unknown line mode %s'):format(line.mode))

Replacement in source_undo.lua at line 82 [34.68]

B:BD[34.2464] → [34.2464:2507]

  assert(from.start_line == to.start_line)

[34.2464]

[34.2507]

  assert(from.start_line == to.start_line, 'failed to patch undo operation')

Replacement in source_undo.lua at line 86 [34.68]

B:BD[34.2584] → [34.2584:2635]

  assert(#to.lines == to.end_line-to.start_line+1)

[34.2584]

[34.2635]

  assert(#to.lines == to.end_line-to.start_line+1, 'failed to patch undo operation')

Replacement in source_undo.lua at line 93 [34.68]

B:BD[34.2775] → [34.2775:2818]

  assert(from.start_line == to.start_line)

[34.2775]

[34.2818]

  assert(from.start_line == to.start_line, 'failed to patch undo operation')

Replacement in source_undo.lua at line 97 [34.68]

B:BD[34.2900] → [34.2900:2951]

  assert(#to.lines == to.end_line-to.start_line+1)

[34.2900]

[34.2951]

  assert(#to.lines == to.end_line-to.start_line+1, 'failed to patch undo operation')

Replacement in source_text.lua at line 20 [34.83786]

B:BD[34.87493] → [35.255:307]

  assert(#line_cache.screen_line_starting_pos >= 1)

[34.87493]

[35.307]

  assert(#line_cache.screen_line_starting_pos >= 1, 'line cache missing screen line info')

Replacement in source_text.lua at line 212 [34.83786]

B:BD[34.97898] → [36.7:64]

  assert(State.lines[State.cursor1.line].mode == 'text')

[34.97898]

[37.1487]

  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')

Replacement in source_text.lua at line 289 [34.83786]

B:BD[34.102919] → [34.102919:102974]

    assert(Text.le1(State.screen_top1, State.cursor1))

[34.102919]

[34.102974]

    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 source_text.lua at line 455 [34.83786]

B:BD[34.109190] → [8.5440:5497]

  assert(State.lines[State.cursor1.line].mode == 'text')

[34.109190]

[34.109301]

  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')

Replacement in source_text.lua at line 481 [34.83786]

B:BD[34.110604] → [34.110604:110638]

    assert(screen_line_index > 1)

[34.110604]

[34.110638]

    assert(screen_line_index > 1, 'bumped up against top screen line in line')

Replacement in source_text.lua at line 498 [34.83786]

B:BD[34.114899] → [8.7470:7527]

  assert(State.lines[State.cursor1.line].mode == 'text')

[34.114899]

  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')

Replacement in source_text.lua at line 500 [34.83786]
B:BD[34.115058] → [38.7:35]
```
  assert(State.cursor1.pos)
```
[34.115058]
[34.115058]
```
  assert(State.cursor1.pos, 'cursor has no pos')
```
Replacement in source_text.lua at line 574 [34.83786]
B:BD[34.120443] → [34.120443:120477]
```
    assert(State.cursor1.pos > 1)
```
[34.120443]
[34.120477]
```
    assert(State.cursor1.pos > 1, 'bumped up against start of line')
```
Deletion in source_text.lua at line 608 [34.83786]
B:BD[34.122603] → [34.122603:122626]
```
  assert(start_offset)
```

Replacement in source_text.lua at line 609 [34.83786]

B:BD[34.122669] → [34.122669:122705]

  assert(end_offset > start_offset)

[34.122669]

[34.122705]

  assert(end_offset > start_offset, ('end_offset %d not > start_offset %d'):format(end_offset, start_offset))

Replacement in source_text.lua at line 615 [34.83786]

B:BD[34.122810] → [37.4694:4751]

  assert(State.lines[State.cursor1.line].mode == 'text')

[34.122810]

[34.122927]

  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')

Replacement in source_text.lua at line 648 [34.83786]

B:BD[34.124061] → [8.8418:8475]

  assert(State.lines[State.cursor1.line].mode == 'text')

[34.124061]

[34.124226]

  assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')

Replacement in source_text.lua at line 673 [34.83786]
B:BD[34.125663] → [34.125663:125679]
```
  assert(false)
```
[34.125663]
[34.125679]
```
  assert(false, ('invalid pos %d'):format(loc1.pos))
```
Replacement in source_text.lua at line 687 [34.83786]
B:BD[39.4230] → [39.4230:4246]
```
  assert(false)
```
[39.4230]
[39.4246]
```
  assert(false, ('invalid pos %d'):format(loc1.pos))
```

Replacement in source_text.lua at line 712 [34.83786]

B:BD[8.9509] → [8.9509:9558]

    assert(State.cursor1.line == #State.lines+1)

[8.9509]

[8.9558]

    assert(State.cursor1.line == #State.lines+1, 'tried to ensure bottom line of file is text, but failed')

Replacement in source_text.lua at line 744 [34.83786]

B:BD[8.9972] → [8.9972:10057]

      assert(top2.line > 1)
      assert(State.lines[top2.line-1].mode == 'drawing')

[8.9972]

[8.10057]

      assert(top2.line > 1, 'tried to snap cursor to buttom of screen but failed')
      assert(State.lines[top2.line-1].mode == 'drawing', "expected a drawing but it's not")

Replacement in source_text.lua at line 777 [34.83786]
B:BD[34.130948] → [34.130948:130982]
```
  assert(my >= line_cache.starty)
```
[34.130948]
[34.130982]
```
  assert(my >= line_cache.starty, 'failed to map y pixel to line')
```
Replacement in source_text.lua at line 800 [34.83786]
B:BD[34.135420] → [34.135420:135436]
```
  assert(false)
```
[34.135420]
[34.135436]
```
  assert(false, 'failed to map y pixel to line')
```
Replacement in source_text.lua at line 866 [34.83786]
B:BD[34.138612] → [34.138612:138628]
```
  assert(false)
```
[34.138612]
[34.138628]
```
  assert(false, 'failed to map x pixel to pos')
```
Replacement in source_text.lua at line 897 [34.83786]
B:BD[34.139436] → [34.139436:139452]
```
  assert(false)
```
[34.139436]
[34.139452]
```
  assert(false, 'failed to map x pixel to pos')
```
Replacement in source_text.lua at line 928 [34.83786]
B:BD[34.140472] → [34.140472:140500]
```
  assert(result.screen_pos)
```
[34.140472]
[34.141153]
```
  assert(result.screen_pos, 'failed to convert schema-1 coordinate to schema-2')
```
Replacement in source_text.lua at line 970 [34.83786]
B:BD[34.142386] → [34.142386:142403]
```
  assert(result)
```
[34.142386]
[34.142403]
```
  assert(result, "Text.offset returned nil; this is likely a failure to handle utf8")
```
Replacement in source_file.lua at line 66 [34.150304]
B:BD[8.11419] → [8.11419:11436]
```
    assert(line)
```
[8.11419]
[8.11436]
```
    assert(line, 'drawing in file is incomplete')
```

Replacement in source_file.lua at line 91 [34.150304]

B:BD[8.12752] → [8.12752:12796]

      print(shape.mode)
      assert(false)

[8.12752]

[8.12796]

      assert(false, ('unknown drawing mode %s'):format(shape.mode))

Replacement in source_file.lua at line 125 [34.150304]

B:BD[8.14024] → [8.14024:14068]

      print(shape.mode)
      assert(false)

[8.14024]

[8.14068]

      assert(false, ('unknown drawing mode %s'):format(shape.mode))

Replacement in source_file.lua at line 163 [34.150304]
B:BD[8.14919] → [8.14919:14933]
```
    assert(i)
```
[8.14919]
[8.14933]
```
    assert(i, 'drawing in array is incomplete')
```

Replacement in source_file.lua at line 189 [34.150304]

B:BD[8.16266] → [8.16266:16310]

      print(shape.mode)
      assert(false)

[8.16266]

[8.16310]

      assert(false, ('unknown drawing mode %s'):format(shape.mode))

Replacement in source_edit.lua at line 161 [34.152503]

B:BD[34.155492] → [40.4077:4251]

∅:D[40.4251] → [34.155536:155593]

B:BD[34.155536] → [34.155536:155593]

B:BD[34.155593] → [37.8399:8495]

∅:D[37.8495] → [34.155733:155757]

B:BD[34.155733] → [34.155733:155757]

  if #State.lines ~= #State.line_cache then
    print(('line_cache is out of date; %d when it should be %d'):format(#State.line_cache, #State.lines))
    assert(false)
  end
  if not Text.le1(State.screen_top1, State.cursor1) then
    print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
    assert(false)
  end

[34.155492]

[34.155757]

  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))
  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 source_edit.lua at line 206 [34.152503]

B:BD[8.20018] → [8.20018:20061]

      print(line.mode)
      assert(false)

[8.20018]

[34.156405]

      assert(false, ('unknown line mode %s'):format(line.mode))

Resurrecting zombie bytes in select.lua at line 128 [41.43980]
B:B[41.47674] → [23.6568:6621]
BD:B[41.47674] → [23.6568:6621]
```
  local rhs = State.lines[maxl].data:sub(max_offset)
```

Insertion in select.lua at line 128 [41.43980]

[41.47652]

[23.6568]

  assert(minl < maxl, ('minl %d not < maxl %d'):format(minl, maxl))

Deletion in select.lua at line 130 [41.43980]
B:BD[41.47652] → [6.6172:6240]
BD:BD[41.47652] → [6.6172:6240]
```
  assert(minl < maxl, ('minl %d not < maxl %d'):format(minl, maxl))
```
Solving an order conflict in select.lua at line 130 [41.43980]
[23.6621]
[41.47721]
Resurrecting zombie bytes in select.lua at line 155 [41.43980]
B:B[41.48447] → [23.6891:6949]
BD:B[41.48447] → [23.6891:6949]
```
  local result = {State.lines[minl].data:sub(min_offset)}
```

Insertion in select.lua at line 155 [41.43980]

[41.48425]

[23.6891]

  assert(minl < maxl, ('minl %d not < maxl %d'):format(minl, maxl))

Deletion in select.lua at line 157 [41.43980]
B:BD[41.48425] → [6.6241:6309]
BD:BD[41.48425] → [6.6241:6309]
```
  assert(minl < maxl, ('minl %d not < maxl %d'):format(minl, maxl))
```
Solving an order conflict in select.lua at line 157 [41.43980]
[23.6949]
[41.48503]

Replacement in log_browser.lua at line 78 [34.191243]

∅:D[38.177] → [34.194281:194325]

B:BD[34.194281] → [34.194281:194325]

  assert(#State.lines == #State.line_cache)

[38.177]

[34.194325]

  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))

Replacement in log_browser.lua at line 98 [34.191243]

∅:D[10.1813] → [34.195420:195458]

B:BD[34.195420] → [34.195420:195458]

        else assert(line.section_end)

[10.1813]

[34.195458]

        else assert(line.section_end, "log line has a section name, but it's neither the start nor end of a section")

File un-deletion: geom.lua, geom.lua
BFD:BF[42.15081] → [42.11579:11579]
BFD:BF[7.2] → [42.15049:15081]
BFD:BF[7.2] → [42.15049:15081]
Resurrecting zombie bytes in geom.lua at line 1 [42.11579]
B:B[42.12514] → [6.6684:6750]
BD:B[42.12514] → [6.6684:6750]
```
    assert(false, ('unknown drawing mode %s'):format(shape.mode))
```

Insertion in geom.lua at line 1 [42.11579]

[42.11579]

[6.6684]

geom = {}
function geom.on_shape(x,y, drawing, shape)
  if shape.mode == 'freehand' then
    return geom.on_freehand(x,y, drawing, shape)
  elseif shape.mode == 'line' then
    return geom.on_line(x,y, drawing, shape)
  elseif shape.mode == 'manhattan' then
    local p1 = drawing.points[shape.p1]
    local p2 = drawing.points[shape.p2]
    if p1.x == p2.x then
      if x ~= p1.x then return false end
      local y1,y2 = p1.y, p2.y
      if y1 > y2 then
        y1,y2 = y2,y1
      end
      return y >= y1-2 and y <= y2+2
    elseif p1.y == p2.y then
      if y ~= p1.y then return false end
      local x1,x2 = p1.x, p2.x
      if x1 > x2 then
        x1,x2 = x2,x1
      end
      return x >= x1-2 and x <= x2+2
    end
  elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
    return geom.on_polygon(x,y, drawing, shape)
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    local dist = geom.dist(center.x,center.y, x,y)
    return dist > shape.radius*0.95 and dist < shape.radius*1.05
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    local dist = geom.dist(center.x,center.y, x,y)
    if dist < shape.radius*0.95 or dist > shape.radius*1.05 then
      return false
    end
    return geom.angle_between(center.x,center.y, x,y, shape.start_angle,shape.end_angle)
  elseif shape.mode == 'deleted' then
  else

Insertion in geom.lua at line 42 [42.11579]

[6.6750]

  end
end
function geom.on_freehand(x,y, drawing, shape)
  local prev
  for _,p in ipairs(shape.points) do
    if prev then
      if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then
        return true
      end
    end
    prev = p
  end
  return false
end
function geom.on_line(x,y, drawing, shape)
  local p1,p2
  if type(shape.p1) == 'number' then
    p1 = drawing.points[shape.p1]
    p2 = drawing.points[shape.p2]
  else
    p1 = shape.p1
    p2 = shape.p2
  end
  if p1.x == p2.x then
    if math.abs(p1.x-x) > 2 then
      return false
    end
    local y1,y2 = p1.y,p2.y
    if y1 > y2 then
      y1,y2 = y2,y1
    end
    return y >= y1-2 and y <= y2+2
  end
  -- has the right slope and intercept
  local m = (p2.y - p1.y) / (p2.x - p1.x)
  local yp = p1.y + m*(x-p1.x)
  if yp < y-2 or yp > y+2 then
    return false
  end
  -- between endpoints
  local k = (x-p1.x) / (p2.x-p1.x)
  return k > -0.005 and k < 1.005
end
function geom.on_polygon(x,y, drawing, shape)
  local prev
  for _,p in ipairs(shape.vertices) do
    if prev then
      if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then
        return true
      end
    end
    prev = p
  end
  return geom.on_line(x,y, drawing, {p1=shape.vertices[1], p2=shape.vertices[#shape.vertices]})
end
-- are (x3,y3) and (x4,y4) on the same side of the line between (x1,y1) and (x2,y2)
function geom.same_side(x1,y1, x2,y2, x3,y3, x4,y4)
  if x1 == x2 then
    return math.sign(x3-x1) == math.sign(x4-x1)
  end
  if y1 == y2 then
    return math.sign(y3-y1) == math.sign(y4-y1)
  end
  local m = (y2-y1)/(x2-x1)
  return math.sign(m*(x3-x1) + y1-y3) == math.sign(m*(x4-x1) + y1-y4)
end
function math.sign(x)
  if x > 0 then
    return 1
  elseif x == 0 then
    return 0
  elseif x < 0 then
    return -1
  end
end
function geom.angle_with_hint(x1, y1, x2, y2, hint)
  local result = geom.angle(x1,y1, x2,y2)
  if hint then
    -- Smooth the discontinuity where angle goes from positive to negative.
    -- The hint is a memory of which way we drew it last time.
    while result > hint+math.pi/10 do
      result = result-math.pi*2
    end
    while result < hint-math.pi/10 do
      result = result+math.pi*2
    end
  end
  return result
end
-- result is from -π/2 to 3π/2, approximately adding math.atan2 from Lua 5.3
-- (LÖVE is Lua 5.1)
function geom.angle(x1,y1, x2,y2)
  local result = math.atan((y2-y1)/(x2-x1))
  if x2 < x1 then
    result = result+math.pi
  end
  return result
end
-- is the line between x,y and cx,cy at an angle between s and e?
function geom.angle_between(ox,oy, x,y, s,e)
  local angle = geom.angle(ox,oy, x,y)
  if s > e then
    s,e = e,s
  end
  -- I'm not sure this is right or ideal..
  angle = angle-math.pi*2
  if s <= angle and angle <= e then
    return true
  end
  angle = angle+math.pi*2
  if s <= angle and angle <= e then
    return true
  end
  angle = angle+math.pi*2
  return s <= angle and angle <= e
end
function geom.dist(x1,y1, x2,y2) return ((x2-x1)^2+(y2-y1)^2)^0.5 end

Replacement in file.lua at line 46 [42.15083]

B:BD[42.16435] → [6.6751:6801]

BD:BD[42.16435] → [6.6751:6801]

B:BD[43.244] → [6.6802:6870]

BD:BD[43.244] → [6.6802:6870]

B:BD[43.394] → [6.6871:6939]

BD:BD[43.394] → [6.6871:6939]

    assert(line, 'drawing in file is incomplete')
      assert(false, ('unknown drawing mode %s'):format(shape.mode))
      assert(false, ('unknown drawing mode %s'):format(shape.mode))

[42.16243]

[42.18207]

-- for tests
function load_array(a)
  local result = {}
  local next_line = ipairs(a)
  local i,line,drawing = 0, ''
  while true do
    i,line = next_line(a, i)
    if i == nil then break end
    table.insert(result, {data=line})
  end
  if #result == 0 then
    table.insert(result, {data=''})
  end
  return result

Deletion in file.lua at line 79 [42.15083]
B:BD[44.1381] → [44.1381:1467]
B:BD[44.1467] → [45.2551:2582]
∅:D[45.2582] → [44.1490:1566]
B:BD[44.1490] → [44.1490:1566]
B:BD[44.1566] → [23.7991:8029]
∅:D[23.8029] → [44.1810:1839]
∅:D[19.9433] → [44.1810:1839]
B:BD[44.1810] → [44.1810:1839]
B:BD[44.1839] → [23.8030:8066]
∅:D[23.8066] → [44.1888:1910]
∅:D[19.9463] → [44.1888:1910]
B:BD[44.1888] → [44.1888:1910]
B:BD[44.1910] → [46.532:532]
B:BD[44.2092] → [6.6940:6988]
BD:BD[44.2092] → [6.6940:6988]
B:BD[44.3157] → [6.6989:7057]
BD:BD[44.3157] → [6.6989:7057]
```
-- for tests
function load_array(a)
  local result = {}
  local next_line = ipairs(a)
  local i,line,drawing = 0, ''
  while true do
    i,line = next_line(a, i)
    if i == nil then break end
    table.insert(result, {data=line})
  end
  if #result == 0 then
    table.insert(result, {data=''})
  end
  return result
    assert(i, 'drawing in array is incomplete')
      assert(false, ('unknown drawing mode %s'):format(shape.mode))
```
Solving an order conflict in file.lua at line 79 [42.15083]
[47.1296]
Deletion in edit.lua at line 50 [48.413]
B:BD[48.3184] → [6.7058:7130]
BD:BD[48.3184] → [6.7058:7130]
```
    current_drawing_mode = 'line',  -- one of the available shape modes
```

Replacement in edit.lua at line 103 [48.413]

B:BD[49.108] → [49.108:459]

  if #State.lines ~= #State.line_cache then
    print(('line_cache is out of date; %d when it should be %d'):format(#State.line_cache, #State.lines))
    assert(false)
  end
  if not Text.le1(State.screen_top1, State.cursor1) then
    print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
    assert(false)
  end

[49.108]

[49.459]

  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))
  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))

Deletion in edit.lua at line 456 [48.413]

B:BD[49.12430] → [4.213:213]

B:BD[48.5492] → [6.7493:7557]

BD:BD[48.5492] → [6.7493:7557]

B:BD[50.1023] → [6.7131:7492]

BD:BD[50.1023] → [6.7131:7492]

      assert(false, ('unknown line mode %s'):format(line.mode))
  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))
  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))

Solving an order conflict in edit.lua at line 456 [48.413]
[49.12430]
Deletion in drawing.lua at line 36 [52.98]
B:BD[51.11261] → [51.11261:11279]
```
    assert(shape)
```

Replacement in drawing.lua at line 115 [52.98]

B:BD[51.14400] → [51.14400:14440]

    print(shape.mode)
    assert(false)

[51.14400]

[51.14440]

    assert(false, ('unknown drawing mode %s'):format(shape.mode))

Deletion in drawing.lua at line 127 [52.98]
B:BD[51.14879] → [10.9688:9688]
B:BD[53.1687] → [6.7558:7624]
BD:BD[53.1687] → [6.7558:7624]
```
    assert(false, ('unknown drawing mode %s'):format(shape.mode))
```
Solving an order conflict in drawing.lua at line 127 [52.98]
[51.14879]
[54.7397]

Replacement in drawing.lua at line 208 [52.98]

B:BD[51.18327] → [51.18327:18367]

    print(shape.mode)
    assert(false)

[51.18327]

[51.18367]

    assert(false, ('unknown drawing mode %s'):format(shape.mode))

Deletion in drawing.lua at line 218 [52.98]
B:BD[51.18674] → [55.1479:1479]
B:BD[56.4021] → [6.7625:7691]
BD:BD[56.4021] → [6.7625:7691]
```
    assert(false, ('unknown drawing mode %s'):format(shape.mode))
```
Solving an order conflict in drawing.lua at line 218 [52.98]
[51.18674]
[57.883]

Replacement in drawing.lua at line 239 [52.98]

B:BD[51.19871] → [51.19871:19927]

    print(State.current_drawing_mode)
    assert(false)

[51.19871]

[51.19927]

    assert(false, ('unknown drawing mode %s'):format(State.current_drawing_mode))

Replacement in drawing.lua at line 254 [52.98]
∅:D[55.1656] → [51.20230:20266]
B:BD[51.20230] → [51.20230:20266]
```
  assert(drawing.mode == 'drawing')
```
[55.1656]
[51.20266]
```
  assert(drawing.mode == 'drawing', 'Drawing.update: line is not a drawing')
```
Deletion in drawing.lua at line 297 [52.98]
B:BD[51.21692] → [55.1658:1658]
B:BD[56.4193] → [6.7692:7774]
BD:BD[56.4193] → [6.7692:7774]
```
    assert(false, ('unknown drawing mode %s'):format(State.current_drawing_mode))
```
Solving an order conflict in drawing.lua at line 297 [52.98]
[51.21692]
[54.7466]

Replacement in drawing.lua at line 341 [52.98]

B:BD[51.24131] → [51.24131:24178]

        assert(#drawing.pending.vertices <= 2)

[51.24131]

[51.24178]

        assert(#drawing.pending.vertices <= 2, 'Drawing.mouse_release: rectangle has too many pending vertices')

Replacement in drawing.lua at line 356 [52.98]

B:BD[51.25113] → [51.25113:25160]

        assert(#drawing.pending.vertices <= 2)

[51.25113]

[51.25160]

        assert(#drawing.pending.vertices <= 2, 'Drawing.mouse_release: square has too many pending vertices')

Replacement in drawing.lua at line 385 [52.98]

B:BD[51.26978] → [51.26978:27036]

        print(drawing.pending.mode)
        assert(false)

[51.26978]

[51.27036]

        assert(false, ('unknown drawing mode %s'):format(drawing.pending.mode))

Deletion in drawing.lua at line 393 [52.98]

B:BD[58.207] → [6.7775:7852]

BD:BD[58.207] → [6.7775:7852]

B:BD[59.1574] → [6.7853:7966]

BD:BD[59.1574] → [6.7853:7966]

B:BD[59.2272] → [6.7967:8077]

BD:BD[59.2272] → [6.7967:8077]

B:BD[56.6342] → [6.8078:8158]

BD:BD[56.6342] → [6.8078:8158]

  assert(drawing.mode == 'drawing', 'Drawing.update: line is not a drawing')
        assert(#drawing.pending.vertices <= 2, 'Drawing.mouse_release: rectangle has too many pending vertices')
        assert(#drawing.pending.vertices <= 2, 'Drawing.mouse_release: square has too many pending vertices')
        assert(false, ('unknown drawing mode %s'):format(drawing.pending.mode))

Solving an order conflict in drawing.lua at line 393 [52.98]
[51.27152]
[54.7524]

Replacement in drawing.lua at line 543 [52.98]

B:BD[51.35589] → [51.35589:35613]

            assert(idx)

[51.35589]

[51.35613]

            assert(idx, 'point to delete is not in vertices')

Deletion in drawing.lua at line 639 [52.98]
B:BD[51.39139] → [51.39139:39163]
```
          assert(shape)
```
Deletion in drawing.lua at line 656 [52.98]
B:BD[51.39806] → [51.39806:39830]
```
          assert(point)
```

Replacement in drawing.lua at line 692 [52.98]

B:BD[51.40949] → [51.40949:40989]

    print(shape.mode)
    assert(false)

[51.40949]

[51.40989]

    assert(false, ('unknown drawing mode %s'):format(shape.mode))

Replacement in drawing.lua at line 697 [52.98]

B:BD[51.41033] → [51.41033:41068]

  assert(shape.mode == 'freehand')

[51.41033]

[51.41068]

  assert(shape.mode == 'freehand', 'can only smoothen freehand shapes')

Deletion in drawing.lua at line 744 [52.98]
B:BD[60.11016] → [6.8159:8221]
BD:BD[60.11016] → [6.8159:8221]
B:BD[42.21459] → [6.8222:8288]
BD:BD[42.21459] → [6.8222:8288]
B:BD[61.230] → [6.8289:8361]
BD:BD[61.230] → [6.8289:8361]
```
            assert(idx, 'point to delete is not in vertices')
    assert(false, ('unknown drawing mode %s'):format(shape.mode))
  assert(shape.mode == 'freehand', 'can only smoothen freehand shapes')
```
Solving an order conflict in drawing.lua at line 744 [52.98]
[51.42200]
Replacement in commands.lua at line 139 [34.203826]
B:BD[62.3209] → [62.3209:3225]
```
  assert(index)
```
[62.3209]
[62.3225]
```
  assert(index, 'file missing from manifest')
```

resolve conflicts

Dependencies

In channels

Change contents

File deletion: geom.lua

File deletion: source_undo.lua, source_undo.lua

File deletion: source_text.lua, source_text.lua

File deletion: source_file.lua, source_file.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: log_browser.lua, log_browser.lua

File deletion: commands.lua, commands.lua

Deletion in undo.lua at line 62 [18.1]

Solving an order conflict in undo.lua at line 62 [18.1]

Deletion in text.lua at line 380 [21.1]

Resurrecting zombie bytes in text.lua at line 401 [21.1]

Insertion in text.lua at line 401 [21.1]

Deletion in text.lua at line 405 [21.1]

Solving an order conflict in text.lua at line 405 [21.1]

Deletion in text.lua at line 418 [21.1]

Resurrecting zombie bytes in text.lua at line 487 [21.1]

Insertion in text.lua at line 487 [21.1]

Deletion in text.lua at line 489 [21.1]

Solving an order conflict in text.lua at line 489 [21.1]

Deletion in text.lua at line 528 [21.1]

Deletion in text.lua at line 552 [21.1]

Solving an order conflict in text.lua at line 552 [21.1]

Deletion in text.lua at line 595 [21.1]

Solving an order conflict in text.lua at line 595 [21.1]

Deletion in text.lua at line 617 [21.1]

Solving an order conflict in text.lua at line 617 [21.1]

Deletion in text.lua at line 942 [21.1]

Solving an order conflict in text.lua at line 942 [21.1]

Replacement in source_undo.lua at line 39 [34.68]

Replacement in source_undo.lua at line 43 [34.68]

Replacement in source_undo.lua at line 68 [34.68]

Replacement in source_undo.lua at line 82 [34.68]

Replacement in source_undo.lua at line 86 [34.68]

Replacement in source_undo.lua at line 93 [34.68]

Replacement in source_undo.lua at line 97 [34.68]

Replacement in source_text.lua at line 20 [34.83786]

Replacement in source_text.lua at line 212 [34.83786]

Replacement in source_text.lua at line 289 [34.83786]

Replacement in source_text.lua at line 455 [34.83786]

Replacement in source_text.lua at line 481 [34.83786]

Replacement in source_text.lua at line 498 [34.83786]

Replacement in source_text.lua at line 500 [34.83786]

Replacement in source_text.lua at line 574 [34.83786]

Deletion in source_text.lua at line 608 [34.83786]

Replacement in source_text.lua at line 609 [34.83786]

Replacement in source_text.lua at line 615 [34.83786]

Replacement in source_text.lua at line 648 [34.83786]

Replacement in source_text.lua at line 673 [34.83786]

Replacement in source_text.lua at line 687 [34.83786]

Replacement in source_text.lua at line 712 [34.83786]

Replacement in source_text.lua at line 744 [34.83786]

Replacement in source_text.lua at line 777 [34.83786]

Replacement in source_text.lua at line 800 [34.83786]

Replacement in source_text.lua at line 866 [34.83786]

Replacement in source_text.lua at line 897 [34.83786]

Replacement in source_text.lua at line 928 [34.83786]

Replacement in source_text.lua at line 970 [34.83786]

Replacement in source_file.lua at line 66 [34.150304]

Replacement in source_file.lua at line 91 [34.150304]

Replacement in source_file.lua at line 125 [34.150304]

Replacement in source_file.lua at line 163 [34.150304]

Replacement in source_file.lua at line 189 [34.150304]

Replacement in source_edit.lua at line 161 [34.152503]

Replacement in source_edit.lua at line 206 [34.152503]

Resurrecting zombie bytes in select.lua at line 128 [41.43980]

Insertion in select.lua at line 128 [41.43980]

Deletion in select.lua at line 130 [41.43980]

Solving an order conflict in select.lua at line 130 [41.43980]

Resurrecting zombie bytes in select.lua at line 155 [41.43980]

Insertion in select.lua at line 155 [41.43980]

Deletion in select.lua at line 157 [41.43980]

Solving an order conflict in select.lua at line 157 [41.43980]

Replacement in log_browser.lua at line 78 [34.191243]

Replacement in log_browser.lua at line 98 [34.191243]

File un-deletion: geom.lua, geom.lua

Resurrecting zombie bytes in geom.lua at line 1 [42.11579]