pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
Sep 1, 2024, 8:19 AM
FBBHEUQNDHGZQES6GC3VW55DXILRP7PYYXNLQF3HGHKYLUGWAUBQC

Dependencies

  • [2] QZUFJMD5 resolve conflicts
  • [3] 237LRHDO clean up Drawing.before after creating undo event
  • [4] 6TBU3VTN explicitly state when operations manage undo
  • [5] WYK3HCQD clean up some issues I now feel confident about
  • [6] IDGP4BJZ new known issue with drawings
  • [7] 7YGYHOEO Merge lines.love
  • [8] GVJEOWYQ resolve conflicts
  • [9] RXMHAZ6V resolve conflicts
  • [10] RSZD5A7G forgot to add json.lua
  • [11] F4QQIBEH clarify what "large files" means
  • [12] 2L5MEZV3 experiment: new edit namespace
  • [13] XX7G2FFJ intermingle freehand line drawings with text
  • [14] K2X6G75Z start writing some tests for drawings
  • [15] CQVWNL4M resolve conflicts
  • [16] 3XNFQDDN Merge lines.love
  • [17] ED4Z6ORC cleaner API for file-system access
  • [18] R5QXEHUI somebody stop me
  • [19] 2CTN2IEF Merge lines.love
  • [20] JUU6KXPC bugfix: don't clear selection on M-arrow
  • [21] VXORMHME delete experimental REPL
  • [22] LWPFEZBI Merge lines.love
  • [23] ZLJYLPOT Merge lines.love
  • [24] OTIBCAUJ love2d scaffold
  • [25] 66X36NZN a little more prose describing manual_tests
  • [26] 3PSFWAIL Merge lines.love
  • [27] 4SR3Z4Y3 document the version of LÖVE I've been using
  • [28] 2JBAEQHU Merge lines.love
  • [29] R2ASHK5C fix a bad merge
  • [30] LXTTOB33 extract a couple of files
  • [31] UTDSCN3G Merge lines.love
  • [32] 6D5MOJS4 allow buttons to interrupt events
  • [33] TLOAPLBJ add a license
  • [34] FPY4LO2W make a few names consistent with snake_case
  • [35] WKXJNESI resolve conflicts
  • [36] TFUNIT6M resolve conflicts
  • [37] LNUHQOGH start passing in Editor_state explicitly
  • [38] VHUNJHXB Merge lines.love
  • [39] JOPVPUSA editing source code from within the app
  • [40] QMRQL2FO resolve conflicts
  • [41] MUDXM3JI clearing starty is redundant in mutations
  • [42] BULPIBEG beginnings of a module for the text editor
  • [43] KKQKPGCI resolve conflicts
  • [44] OGUV4HSA remove some memory leaks from rendered fragments
  • [45] MTIS2XTC affirm a priority
  • [46] WJBZZQE4 fold together two largely similar cases
  • [47] SCOXD4EO Merge lines.love
  • [48] SGMA5JLE save the list of tests in repo
  • [49] 34TC5SYK record another known issue I don't know how to fix yet
  • [50] TVCPXAAU rename
  • [51] KMSL74GA support selections in the source editor
  • [52] TOXPJJYY resolve conflicts
  • [53] T4FRZSYL delete an ancient, unused file
  • [54] OI4FPFIN support drawings in the source editor
  • [55] CRBLAWBO resolve conflicts
  • [56] CE4LZV4T drop last couple of manual tests
  • [57] MLG2OGU7 things seem to feel snappier now
  • [58] BLWAYPKV extract a module
  • [59] AVTNUQYR basic test-enabled framework
  • [60] VP5KC4XZ Merge lines.love
  • [61] HWTLXESC Merge lines.love
  • [62] VHQCNMAR several more modules
  • [63] 3QNOKBFM beginnings of a test harness
  • [64] FS2ITYYH record a known issue
  • [65] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
  • [66] 73OCE2MC after much struggle, a brute-force undo
  • [67] UHB4GARJ left/right margin -> left/right coordinates
  • [68] IFTYOERM line.y -> line_cache.starty in a few more places
  • [69] MD3W5IRA new fork: rip out drawing support
  • [70] N2NUGNN4 include a brief reference enabling many useful apps
  • [71] YXQOITYS Merge lines.love
  • [72] LF7BWEG4 group all editor globals
  • [73] K6DTOGOQ flip return value of button handlers
  • [74] KKMFQDR4 editing source code from within the app
  • [75] 6VJTQKW7 start supporting LÖVE v12
  • [76] MBAJPTDJ resolve conflicts
  • [77] TYLURRX3 resolve conflicts
  • [78] 6LJZN727 handle chords
  • [79] TMWSQNZD bugfix in source editor: don't clear selection on M-arrow
  • [80] TBTRYEBP Merge lines.love
  • [81] GX5PD3CL consistently schedule_save after all mutations
  • [82] D2GCFTTT clean up repl functionality
  • [83] 4J3Y3DJW pijul bug: redo upstream change
  • [84] D4B52CQ2 Merge lines.love
  • [85] ORKN6EOB Merge lines.love
  • [86] 4YDBYBA4 clean up memory leak experiments

Change contents

  • file deletion: source_text.lua (----------)source_text.lua (----------)
    [6.2]→[6.147062:147101](∅→∅),[6.2]→[6.147062:147101](∅→∅),[6.147101]→[6.83723:83723](∅→∅)
    Text.delete_selection_and_record_undo_event(State)
    Text.delete_selection_and_record_undo_event(State)
    schedule_save(State)
    return
    end
    schedule_save(State)
    return
    end
  • file deletion: source_edit.lua (----------)source_edit.lua (----------)
    [6.2]→[6.165725:165764](∅→∅),[6.2]→[6.165725:165764](∅→∅),[6.165764]→[6.152440:152440](∅→∅)
    Drawing.before = nil
    Text.delete_selection_and_record_undo_event(State)
    local s = Text.cut_selection_and_record_undo_event(State)
    if s then
    end
    schedule_save(State)
  • replacement in source_text.lua at line 251
    [6.21274]→[6.21274:21334](∅→∅)
    Text.delete_selection(State, State.left, State.right)
    [6.21274]
    [6.21334]
    Text.delete_selection_and_record_undo_event(State)
  • replacement in source_text.lua at line 299
    [6.21417]→[6.21417:21477](∅→∅)
    Text.delete_selection(State, State.left, State.right)
    [6.21417]
    [6.21477]
    Text.delete_selection_and_record_undo_event(State)
  • edit in source_edit.lua at line 193
    [6.19609]
    [2.320]
    Drawing.before = nil
  • replacement in source_edit.lua at line 395
    [6.164]→[6.25793:25851](∅→∅),[6.179]→[6.25793:25851](∅→∅),[6.198]→[6.25793:25851](∅→∅),[6.8468]→[6.25793:25851](∅→∅),[6.25793]→[6.25793:25851](∅→∅)
    Text.delete_selection(State, State.left, State.right)
    [6.8468]
    [6.25851]
    Text.delete_selection_and_record_undo_event(State)
  • replacement in source_edit.lua at line 473
    [6.162145]→[6.162145:162210](∅→∅)
    local s = Text.cut_selection(State, State.left, State.right)
    [6.162038]
    [6.162210]
    local s = Text.cut_selection_and_record_undo_event(State)
  • replacement in edit.lua at line 267
    [6.5120]→[6.5956:6014](∅→∅),[6.5956]→[6.5956:6014](∅→∅)
    Text.delete_selection(State, State.left, State.right)
    [6.5120]
    [6.6014]
    Text.delete_selection_and_record_undo_event(State)
  • replacement in edit.lua at line 344
    [6.9171]→[6.9171:9236](∅→∅)
    local s = Text.cut_selection(State, State.left, State.right)
    [6.9064]
    [6.9236]
    local s = Text.cut_selection_and_record_undo_event(State)
  • edit in edit.lua at line 446
    [6.12430]→[2.538:538](∅→∅),[6.13432]→[4.782:844](∅→∅),[6.13432]→[4.782:844](∅→∅),[6.185]→[4.726:781](∅→∅),[6.185]→[4.726:781](∅→∅),[6.185]→[4.726:781](∅→∅),[6.935]→[3.45:89](∅→∅),[6.935]→[3.45:89](∅→∅),[6.935]→[3.45:89](∅→∅)
    local s = Text.cut_selection_and_record_undo_event(State)
    Text.delete_selection_and_record_undo_event(State)
    Drawing.before = nil
  • resolve order conflict in edit.lua at line 446
    [6.12430]
  • edit in README.md at line 49
    [6.95]→[6.12041:12110](∅→∅),[6.95]→[6.12041:12110](∅→∅)
    other ways. Works well in all circumstances with files under 50KB.