resolve conflicts

akkartik

Feb 18, 2025, 5:37 AM

RUB7L6GYFGVH7NMTWSZWLPFVEMJRVDDK75R45ZA3EVRPHGBO5SKAC

Dependencies

[2] RXMHAZ6V resolve conflicts
[3] VS5HRXU6 reindent
[4] AHNBMC7I slightly improve deepcopy everywhere
[5] R5QXEHUI somebody stop me
[6] K74U4BAU Merge lines.love
[7] MBAJPTDJ resolve conflicts
[8] TOXPJJYY resolve conflicts
[9] LWPFEZBI Merge lines.love
[10] ZLJYLPOT Merge lines.love
[11] JOPVPUSA editing source code from within the app
[12] 3QNOKBFM beginnings of a test harness
[13] TLOAPLBJ add a license
[14] 6VJTQKW7 start supporting LÖVE v12
[15] QIR3VBYI resolve conflicts
[16] KFEUQWHX resolve conflicts
[17] 6LJZN727 handle chords
[18] T4FRZSYL delete an ancient, unused file
[19] KKQKPGCI resolve conflicts
[20] SGMA5JLE save the list of tests in repo
[21] SYWQBIO5 resolve conflicts
[22] 3PSFWAIL Merge lines.love
[23] TVCPXAAU rename
[24] D2GCFTTT clean up repl functionality
[25] TBTRYEBP Merge lines.love
[26] XX7G2FFJ intermingle freehand line drawings with text
[27] KKMFQDR4 editing source code from within the app
[28] ED4Z6ORC cleaner API for file-system access
[29] AVTNUQYR basic test-enabled framework
[30] VHUNJHXB Merge lines.love
[31] BULPIBEG beginnings of a module for the text editor
[32] BLWAYPKV extract a module
[33] VHQCNMAR several more modules
[34] 73OCE2MC after much struggle, a brute-force undo
[35] LXTTOB33 extract a couple of files
[36] OTIBCAUJ love2d scaffold
[37] 4YDBYBA4 clean up memory leak experiments
[38] K2X6G75Z start writing some tests for drawings
[39] 2L5MEZV3 experiment: new edit namespace
[40] CE4LZV4T drop last couple of manual tests
[41] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[42] KMSL74GA support selections in the source editor
[43] VP5KC4XZ Merge lines.love
[44] ICFNWHOL create a place for graphical log handlers
[45] N2NUGNN4 include a brief reference enabling many useful apps
[46] RSZD5A7G forgot to add json.lua
[47] T45HTERY change section delimiters in log for OpenBSD
[48] VXORMHME delete experimental REPL
[49] OGUV4HSA remove some memory leaks from rendered fragments
[50] 2CTN2IEF Merge lines.love
[51] 66X36NZN a little more prose describing manual_tests
[52] QXXISTGE resolve conflicts
[53] FS2ITYYH record a known issue
[54] ORKN6EOB Merge lines.love
[55] 4SR3Z4Y3 document the version of LÖVE I've been using

Change contents

file deletion: source_undo.lua (----------)source_undo.lua (----------)

[5.2]→[5.3457:3496](∅→∅),[5.2]→[5.3457:3496](∅→∅),[5.3496]→[5.5:5](∅→∅)

seen = seen or {}
if seen[obj] then return seen[obj] end
seen[obj] = result
result[deepcopy(k, seen)] = deepcopy(v, seen)
end
return result
end

function minmax(a, b)
return math.min(a,b), math.max(a,b)
end
for k,v in pairs(obj) do
local result = setmetatable({}, getmetatable(obj))
file deletion: log.lua (----------)log.lua (----------)

[5.2]→[5.204116:204147](∅→∅),[5.2]→[5.204116:204147](∅→∅),[5.204147]→[5.203264:203264](∅→∅)

local info = debug.getinfo(stack_frame_index, 'Sl')
local msg
if type(obj) == 'string' then
msg = obj
else
msg = json.encode(obj)
end
love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')
if stack_frame_index == nil then
stack_frame_index = 3
end
-- I'd like to use the unicode character \u{250c} here, but it doesn't work
-- in OpenBSD.
log(stack_frame_index, '[ u250c ' .. name)
if stack_frame_index == nil then
stack_frame_index = 3
end
-- I'd like to use the unicode character \u{2518} here, but it doesn't work
-- in OpenBSD.
log(stack_frame_index, '] u2518 ' .. name)
if stack_frame_index == nil then
stack_frame_index = 4
end
log_end(name, stack_frame_index)
log_start(name, stack_frame_index)
end

end

function log_new(name, stack_frame_index)
end
function log_end(name, stack_frame_index)
end

-- for section delimiters we'll use specific Unicode box characters
function log_start(name, stack_frame_index)
replacement in source_undo.lua at line 87

[5.3213]→[5.3213:3286](∅→∅)

if seen and seen[obj] then return seen[obj] end
local s = seen or {}

[5.3213]

[5.3286]

seen = seen or {}
if seen[obj] then return seen[obj] end
replacement in source_undo.lua at line 90

[5.3339]→[5.3339:3357](∅→∅)

s[obj] = result

[5.3339]

[5.3357]

seen[obj] = result
replacement in source_undo.lua at line 92

[5.3384]→[5.3384:3428](∅→∅)

result[deepcopy(k, s)] = deepcopy(v, s)

[5.3384]

[5.3428]

result[deepcopy(k, seen)] = deepcopy(v, seen)
replacement in log.lua at line 2

[5.202763]→[5.202763:202993](∅→∅)

local info = debug.getinfo(stack_frame_index, 'Sl')
local msg
if type(obj) == 'string' then
msg = obj
else
msg = json.encode(obj)
end
love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')

[5.202763]

[5.202993]

local info = debug.getinfo(stack_frame_index, 'Sl')
local msg
if type(obj) == 'string' then
msg = obj
else
msg = json.encode(obj)
end
love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')
replacement in log.lua at line 14

[5.203110]→[5.203110:203173](∅→∅),[5.203173]→[5.275:412](∅→∅)

if stack_frame_index == nil then
stack_frame_index = 3
end
-- I'd like to use the unicode character \u{250c} here, but it doesn't work
-- in OpenBSD.
log(stack_frame_index, '[ u250c ' .. name)

[5.203110]

[5.203218]

if stack_frame_index == nil then
stack_frame_index = 3
end
-- I'd like to use the unicode character \u{250c} here, but it doesn't work
-- in OpenBSD.
log(stack_frame_index, '[ u250c ' .. name)
replacement in log.lua at line 22

[5.203264]→[5.203264:203327](∅→∅),[5.203327]→[5.413:550](∅→∅)

if stack_frame_index == nil then
stack_frame_index = 3
end
-- I'd like to use the unicode character \u{2518} here, but it doesn't work
-- in OpenBSD.
log(stack_frame_index, '] u2518 ' .. name)

[5.203264]

[5.203372]

if stack_frame_index == nil then
stack_frame_index = 3
end
-- I'd like to use the unicode character \u{2518} here, but it doesn't work
-- in OpenBSD.
log(stack_frame_index, '] u2518 ' .. name)
replacement in log.lua at line 31

[5.203419]→[5.203419:203552](∅→∅)

if stack_frame_index == nil then
stack_frame_index = 4
end
log_end(name, stack_frame_index)
log_start(name, stack_frame_index)

[5.203419]

[5.203552]

if stack_frame_index == nil then
stack_frame_index = 4
end
log_end(name, stack_frame_index)
log_start(name, stack_frame_index)