resolve conflicts

akkartik

Sep 1, 2024, 8:31 AM

PZYSWJZC7NCLRSIGF7EWZFHK3AH7R756CVWB3LJFKX7GEHHOFDQAC

Dependencies

• [2] OL7ZCZWD Merge text.love
• [3] EAWHIXKM delete inapplicable issues
• [4] TJPSNNQH Merge text0
• [5] OV6FE23R Merge text0
• [6] PCHTG7YU resolve conflicts
• [7] FBBHEUQN resolve conflicts
• [8] BDUAJA6T resolve conflicts
• [9] 25V2GA6J taking stock
• [10] VJ77YABH more efficient undo/redo
• [11] MTIS2XTC affirm a priority
• [12] 6LJZN727 handle chords
• [13] 2CFLXLIE Merge text.love
• [14] EZHO4TSW new file-system format for freewheeling apps
• [15] VLTU33KW resolve conflicts
• [16] VSGPLJFA resolve conflicts
• [17] MLG2OGU7 things seem to feel snappier now
• [18] A2TQYJ6J .
• [19] VXRYVZ74 Merge text.love
• [20] RXMHAZ6V resolve conflicts
• [21] MOAEVTKJ clean up a few more loose ends
• [22] CGASWIHL irrelevant issue fork this fork
• [23] 242L3OQX bugfix: ensure Cursor_line is always on a text line
• [24] VC2CU2GG faster paste
• [25] KKMFQDR4 editing source code from within the app
• [26] R5QXEHUI somebody stop me
• [27] 36Z442IV back to commit 8123959e52f without code editing
• [28] 5BMR5HRT click to the left of a line
• [29] 57HKHZ7Z include the tool that's mentioned in representation.md
• [30] AVTNUQYR basic test-enabled framework
• [31] RSZD5A7G forgot to add json.lua
• [32] CZQ3NJ4N Merge text0
• [33] KMSL74GA support selections in the source editor
• [34] VXORMHME delete experimental REPL
• [35] 66X36NZN a little more prose describing manual_tests
• [36] 4YDBYBA4 clean up memory leak experiments
• [37] H75RJ3CY Merge text0
• [38] ORKN6EOB Merge lines.love
• [39] 4SR3Z4Y3 document the version of LÖVE I've been using
• [40] FS2ITYYH record a known issue
• [41] JOPVPUSA editing source code from within the app
• [42] VHQCNMAR several more modules
• [43] N2NUGNN4 include a brief reference enabling many useful apps
• [44] R2ASHK5C fix a bad merge
• [45] UEG224LH debug animations
• [46] WYK3HCQD clean up some issues I now feel confident about
• [47] T4FRZSYL delete an ancient, unused file
• [48] IDGP4BJZ new known issue with drawings
• [49] 4J3Y3DJW pijul bug: redo upstream change
• [50] ZLJYLPOT Merge lines.love
• [51] CAG7PP5Y Merge text.love
• [52] MBAJPTDJ resolve conflicts
• [53] BULPIBEG beginnings of a module for the text editor
• [54] XX7G2FFJ intermingle freehand line drawings with text
• [55] K2X6G75Z start writing some tests for drawings
• [56] 73OCE2MC after much struggle, a brute-force undo
• [57] LXTTOB33 extract a couple of files
• [58] OJBGNAN6 slight reorg in Readme
• [59] 3PSFWAIL Merge lines.love
• [60] VHUNJHXB Merge lines.love
• [61] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [62] CE4LZV4T drop last couple of manual tests
• [63] TLOAPLBJ add a license
• [64] SGMA5JLE save the list of tests in repo
• [65] KJLZCK2R resolve conflicts
• [66] LWPFEZBI Merge lines.love
• [67] D43U7GQ4 alter on-disk representation (manifest files)
• [68] 34TC5SYK record another known issue I don't know how to fix yet
• [69] LRDM35CE app running again
• [70] QMRQL2FO resolve conflicts
• [71] 3QNOKBFM beginnings of a test harness
• [72] 6VJTQKW7 start supporting LÖVE v12
• [73] TBTRYEBP Merge lines.love
• [74] R6MNUXDJ pijul bug
• [75] CRBLAWBO resolve conflicts
• [76] TOXPJJYY resolve conflicts
• [77] SW5GN5LP suggest a default layout for freewheeling apps
• [78] KQ22RW43 resolve conflicts
• [79] ED4Z6ORC cleaner API for file-system access
• [80] TVCPXAAU rename
• [81] EV36VCVF another known issue
• [82] D2GCFTTT clean up repl functionality
• [83] 2DVVKKVA flesh out Readme
• [84] VP5KC4XZ Merge lines.love
• [85] OTIBCAUJ love2d scaffold
• [86] OGUV4HSA remove some memory leaks from rendered fragments
• [87] 2L5MEZV3 experiment: new edit namespace
• [88] STOBADP7 delete inapplicable issue
• [89] 4Y2QDDAZ resolve conflicts
• [90] PJ5PQAQE record support for multiple versions
• [91] KKQKPGCI resolve conflicts
• [92] 5OVKHVY6 nice way to make on.* handlers more discoverable
• [93] BLWAYPKV extract a module

Change contents

• file un-deletion: source_text.lua (----------)source_text.lua (----------)source_text.lua (----------)source_text.lua (----------)source_text.lua (----------)
  [9.147164]→[9.83786:83786](∅→∅),[9.2]→[9.147125:147164](∅→∅),[9.2]→[9.147125:147164](∅→∅),[9.147164]→[9.83786:83786](∅→∅),[9.2]→[9.147125:147164](∅→∅),[9.147164]→[9.83786:83786](∅→∅),[9.2]→[9.147125:147164](∅→∅),[9.2]→[9.147125:147164](∅→∅)
• file un-deletion: source_edit.lua (----------)source_edit.lua (----------)source_edit.lua (----------)source_edit.lua (----------)source_edit.lua (----------)
  [9.165827]→[9.152503:152503](∅→∅),[9.2]→[9.165788:165827](∅→∅),[9.2]→[9.165788:165827](∅→∅),[9.165827]→[9.152503:152503](∅→∅),[9.2]→[9.165788:165827](∅→∅),[9.165827]→[9.152503:152503](∅→∅),[9.2]→[9.165788:165827](∅→∅),[9.2]→[9.165788:165827](∅→∅)
• resurrect zombie in edit.lua at line 348
  [9.9064]→[7.365:427](∅→∅),[9.9064]→[7.365:427](∅→∅)
  + local s = Text.cut_selection_and_record_undo_event(State)
• resolve order conflict in edit.lua at line 348
  [5.514]

  [7.365]
• edit in README.md at line 54
  [9.15]→[3.18:135](∅→∅),[9.15]→[3.18:135](∅→∅)
  − * Undo/redo may be sluggish in editor windows containing large files. Large

  − files may grow sluggish in other ways.
• edit in README.md at line 55
  [9.1375]→[9.16:17](∅→∅)
  −