pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
Jun 28, 2024, 5:16 AM
TYLURRX3NWR66WYQSCPNFKB2N42NYKCY2TSL2Z6ZK7L4KCKFZF2QC

Dependencies

  • [2] CRBLAWBO resolve conflicts
  • [3] T6A5SZGB bugfix: restart search on backspace
  • [4] EB6LHFJR use deepcopy where possible
  • [5] N2NUGNN4 include a brief reference enabling many useful apps
  • [6] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
  • [7] RSZD5A7G forgot to add json.lua
  • [8] VHQCNMAR several more modules
  • [9] 66X36NZN a little more prose describing manual_tests
  • [10] ZLJYLPOT Merge lines.love
  • [11] ORKN6EOB Merge lines.love
  • [12] VHUNJHXB Merge lines.love
  • [13] JOPVPUSA editing source code from within the app
  • [14] VP5KC4XZ Merge lines.love
  • [15] QMRQL2FO resolve conflicts
  • [16] VXORMHME delete experimental REPL
  • [17] KKMFQDR4 editing source code from within the app
  • [18] ONHKBLLC Merge lines.love
  • [19] 2TCIWW6Z stop caching starty
  • [20] CE4LZV4T drop last couple of manual tests
  • [21] XX7G2FFJ intermingle freehand line drawings with text
  • [22] 6VJTQKW7 start supporting LÖVE v12
  • [23] 4YDBYBA4 clean up memory leak experiments
  • [24] NSM73TX3 crap, fix some final changes in the source editor
  • [25] OTIBCAUJ love2d scaffold
  • [26] LNUHQOGH start passing in Editor_state explicitly
  • [27] ISOFHXB2 App.width can no longer take a Text
  • [28] SGMA5JLE save the list of tests in repo
  • [29] 5SM6DRHK port inscript's bugfix to source editor
  • [30] T4FRZSYL delete an ancient, unused file
  • [31] D2GCFTTT clean up repl functionality
  • [32] AVTNUQYR basic test-enabled framework
  • [33] 73OCE2MC after much struggle, a brute-force undo
  • [34] VOU73AK6 Merge lines.love
  • [35] 34BZ5ZKN Merge lines.love
  • [36] KKQKPGCI resolve conflicts
  • [37] WKXJNESI resolve conflicts
  • [38] 6LJZN727 handle chords
  • [39] KMSL74GA support selections in the source editor
  • [40] OGUV4HSA remove some memory leaks from rendered fragments
  • [41] ZS5IYZH5 stop caching screen_bottom1
  • [42] 2TQUKHBC Merge lines.love
  • [43] MBAJPTDJ resolve conflicts
  • [44] 3PSFWAIL Merge lines.love
  • [45] 6XCJX4DZ bugfix: inscript's bug
  • [46] GVJEOWYQ resolve conflicts
  • [47] D4B52CQ2 Merge lines.love
  • [48] BLWAYPKV extract a module
  • [49] YXQOITYS Merge lines.love
  • [50] BULPIBEG beginnings of a module for the text editor
  • [51] 2MGBV7NP bugfix: crash when using mouse wheel
  • [52] TFUNIT6M resolve conflicts
  • [53] OI4FPFIN support drawings in the source editor
  • [54] TVCPXAAU rename
  • [55] G54H3YG2 get rid of all bifold text
  • [56] 3XNFQDDN Merge lines.love
  • [57] LXTTOB33 extract a couple of files
  • [58] K2X6G75Z start writing some tests for drawings
  • [59] ED4Z6ORC cleaner API for file-system access
  • [60] LWPFEZBI Merge lines.love
  • [61] MXSAHZN4 Merge lines.love
  • [62] 4SR3Z4Y3 document the version of LÖVE I've been using
  • [63] TBTRYEBP Merge lines.love
  • [64] GFXWHTE6 mouse wheel support
  • [65] R5QXEHUI somebody stop me
  • [66] TLOAPLBJ add a license
  • [67] 2L5MEZV3 experiment: new edit namespace
  • [68] FS2ITYYH record a known issue
  • [69] 3QNOKBFM beginnings of a test harness
  • [70] 2CTN2IEF Merge lines.love
  • [71] 656FM555 bugfix: clear selection when clicking above or below lines
  • [72] 7YGYHOEO Merge lines.love
  • [73] R2ASHK5C fix a bad merge
  • [74] TOXPJJYY resolve conflicts

Change contents

  • file deletion: source_text.lua (----------)source_text.lua (----------)
    [5.2]→[5.147062:147101](∅→∅),[5.2]→[5.147062:147101](∅→∅),[5.147101]→[5.83723:83723](∅→∅)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.selection1 = deepcopy(State.cursor1)
    State.cursor1 = deepcopy(State.screen_top1)
    State.cursor1 = deepcopy(State.screen_top1)
    State.screen_top1 = deepcopy(State.cursor1)
    State.cursor1 = deepcopy(State.screen_top1)
    elseif State.cursor1.line >= screen_bottom1.line then
    end
    end
    function Text.end_of_line(State)
    Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
    Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
    Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks
    end
    end
    end
    end
    end
    end
    end
    end
    end
    end
    end
  • file deletion: source_edit.lua (----------)source_edit.lua (----------)
    [5.2]→[5.165725:165764](∅→∅),[5.2]→[5.165725:165764](∅→∅),[5.165764]→[5.152440:152440](∅→∅)
    State.cursor1 = deepcopy(State.screen_top1)
    State.cursor1 = deepcopy(State.screen_top1)
    edit.put_cursor_on_next_text_line(State)
    edit.clean_up_mouse_press(State)
    return
    end
  • replacement in source_text.lua at line 341
    [5.21621]→[5.2188:2262](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.21621]
    [5.21720]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 346
    [5.21770]→[5.2263:2337](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.21770]
    [5.21869]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 358
    [5.21973]→[5.2338:2412](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.21973]
    [5.22072]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 363
    [5.22122]→[5.2413:2487](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.22122]
    [5.22221]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 374
    [5.22325]→[5.2488:2562](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.22325]
    [5.22424]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 379
    [5.22474]→[5.2563:2637](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.22474]
    [5.22573]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 390
    [5.22677]→[5.2638:2712](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.22677]
    [5.22776]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 395
    [5.22826]→[5.2713:2787](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.22826]
    [5.22925]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 406
    [5.23029]→[5.2788:2862](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.23029]
    [5.23128]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 411
    [5.23178]→[5.2863:2937](∅→∅)
    State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}
    [5.23178]
    [5.23277]
    State.selection1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 428
    [2.2372]→[2.2372:2447](∅→∅)
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    [2.2372]
    [2.2447]
    State.cursor1 = deepcopy(State.screen_top1)
  • replacement in source_text.lua at line 477
    [2.4184]→[5.3945:4020](∅→∅),[5.108805]→[5.3945:4020](∅→∅)
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    [2.4184]
    [5.108909]
    State.cursor1 = deepcopy(State.screen_top1)
  • replacement in source_text.lua at line 597
    [5.118588]→[5.4328:4410](∅→∅)
    State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos} -- copy
    [5.118588]
    [5.118654]
    State.screen_top1 = deepcopy(State.cursor1)
  • replacement in source_text.lua at line 1106
    [5.145626]→[5.145626:145703](∅→∅)
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    [5.145626]
    [2.7690]
    State.cursor1 = deepcopy(State.screen_top1)
  • replacement in source_edit.lua at line 311
    [5.1036]→[5.1036:1115](∅→∅)
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    [5.1036]
    [5.1115]
    State.cursor1 = deepcopy(State.screen_top1)
  • replacement in source_edit.lua at line 354
    [5.84]→[5.84:161](∅→∅)
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    [5.84]
    [5.1069]
    State.cursor1 = deepcopy(State.screen_top1)
  • replacement in edit.lua at line 201
    [5.1953]→[5.1953:2030](∅→∅)
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    [5.1953]
    [5.2030]
    State.cursor1 = deepcopy(State.screen_top1)
  • replacement in edit.lua at line 240
    [5.4804]→[5.4804:4881](∅→∅)
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    [5.4804]
    [5.4881]
    State.cursor1 = deepcopy(State.screen_top1)
  • edit in edit.lua at line 285
    [5.6765]
    [5.6765]
    State.cursor = deepcopy(State.search_backup.cursor)
    State.screen_top = deepcopy(State.search_backup.screen_top)
    Text.search_next(State)
  • edit in edit.lua at line 452
    [5.12430]→[2.9190:9190](∅→∅),[5.1937]→[4.1535:1583](∅→∅),[5.1937]→[4.1535:1583](∅→∅),[5.2934]→[4.1484:1534](∅→∅),[5.2934]→[4.1484:1534](∅→∅),[5.7460]→[3.0:154](∅→∅),[5.7460]→[3.0:154](∅→∅)
    State.cursor1 = deepcopy(State.screen_top1)
    State.cursor1 = deepcopy(State.screen_top1)
    State.cursor = deepcopy(State.search_backup.cursor)
    State.screen_top = deepcopy(State.search_backup.screen_top)
    Text.search_next(State)
  • resolve order conflict in edit.lua at line 452
    [5.12430]