resolve conflicts

akkartik

Feb 18, 2025, 5:50 AM

5T2AKBEXKR57TFRLYXDSVAZGSFN3RVAZPXLJYP2CIC777IC64Q2QC

Dependencies

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

Change contents

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

[4.2]→[4.3520:3559](∅→∅),[4.2]→[4.3520:3559](∅→∅),[4.3559]→[4.68:68](∅→∅)

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 (----------)

[4.2]→[4.203577:203608](∅→∅),[4.2]→[4.203577:203608](∅→∅),[4.203608]→[4.202725:202725](∅→∅)

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)