resolve conflicts

akkartik

Feb 5, 2024, 1:12 AM

3SXNSAX4L2E7IDHAXSMYDPLRX7OFQQCBCXON6C27BDIRSPOJEQBQC

Dependencies

• [2] VESAKVTR Merge lines.love
• [3] FHNPQBLK more carefully pass the 'key' arg around
• [4] 7S6CIN7I Merge upstream into main
• [5] KAUD3YIK tests: deleting points/shapes
• [6] 7DYUAOI6 test: undo moving point
• [7] W7JMT5V2 rip out most support for polygons
• [8] PX7DDEMO autosave slightly less aggressively
• [9] OEUU62GM Merge upstream into main
• [10] UHB4GARJ left/right margin -> left/right coordinates
• [11] PTICQ76Q Merge lines.love
• [12] ORRSP7FV deduce test names on failures
• [13] TGZAJUEF bring back a set of constants
• [14] 4AXV2HG4 all pending manual tests done!
• [15] APYPFFS3 call edit rather than App callbacks in tests
• [16] ACTERT22 Merge lines.love
• [17] LF7BWEG4 group all editor globals
• [18] BCRJ6MHL Merge upstream into main
• [*] K2X6G75Z start writing some tests for drawings

Change contents

• resurrect zombie in drawing_tests.lua at line 545
  [3.10311]→[4.57644:57758](∅→∅),[4.12620]→[4.57644:57758](∅→∅),[4.12620]→[4.57644:57758](∅→∅)
  + check_eq(drawing.shapes[1].mode, 'deleted', 'shape:1')

  + check_eq(drawing.shapes[2].mode, 'deleted', 'shape:2')
• edit in drawing_tests.lua at line 717
  [4.2215]→[2.1826:1826](∅→∅),[4.7270]→[3.10365:10417](∅→∅),[4.7270]→[3.10365:10417](∅→∅),[4.7270]→[3.10365:10417](∅→∅),[4.7652]→[3.10418:10470](∅→∅),[4.7652]→[3.10418:10470](∅→∅),[4.7652]→[3.10418:10470](∅→∅)
  −

  − edit.run_after_keychord(Editor_state, 'C-d', 'd')

  − edit.run_after_keychord(Editor_state, 'C-d', 'd')
• resolve order conflict in drawing_tests.lua at line 717
  [4.2215]