pijul bug: redo upstream change

akkartik

Dec 3, 2023, 7:31 PM

4J3Y3DJWJK4HJ7IAY4GIEFTGBXGIN62KZJIGXW3SEJYOZS53ZVAQC

Dependencies

• [2] R2ASHK5C fix a bad merge
• [3] ORKN6EOB Merge lines.love
• [4] 3PSFWAIL Merge lines.love
• [5] D4B52CQ2 Merge lines.love
• [6] XRP727K3 Merge lines.love
• [7] 7YGYHOEO Merge lines.love
• [8] 2TQUKHBC Merge lines.love
• [9] KKQKPGCI resolve conflicts
• [10] HWTLXESC Merge lines.love
• [11] JOPVPUSA editing source code from within the app
• [12] WKXJNESI resolve conflicts
• [13] YXQOITYS Merge lines.love
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in source_edit.lua at line 387
  [3.110]→[3.110:219](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in source_edit.lua at line 444
  [3.160829]→[3.160829:160936](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in source_edit.lua at line 459
  [3.161403]→[3.161403:161510](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in source_edit.lua at line 482
  [3.162038]→[3.162038:162145](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in source_edit.lua at line 488
  [3.162316]→[3.162316:162423](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in edit.lua at line 262
  [2.5289]→[2.5289:5396](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in edit.lua at line 317
  [2.7604]→[2.7604:7711](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in edit.lua at line 330
  [2.8227]→[2.8227:8334](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in edit.lua at line 351
  [2.9064]→[2.9064:9171](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
• edit in edit.lua at line 357
  [2.9339]→[2.9339:9446](∅→∅)
  − for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll