akkartik/pong.love - Change IDS27PX6ITX6XVQ7PAPNGQBQUHBSM4WY2TBI4PU37PCJBYTVJ6UAC

Merge text.love

Created by Kartik K. Agaram on August 31, 2023

IDS27PX6ITX6XVQ7PAPNGQBQUHBSM4WY2TBI4PU37PCJBYTVJ6UAC

Dependencies

In channels

main

Change contents

Replacement in source_file.lua at line 4 [6.150304]

B:BD[5.143463] → [5.143463:143511]

  local infile = App.open_for_reading(filename)

[5.143463]

[5.143511]

  local infile = App.open_for_reading(App.save_dir..filename)
  if not infile then
    infile = App.open_for_reading(App.source_dir..filename)
  end

Insertion in source_file.lua at line 16 [6.150304]

[5.143598]

-- the source editor supports only files in the save dir backed by the source dir

Replacement in source_file.lua at line 18 [6.150304]

B:BD[5.143629] → [5.143629:143683]

  local infile = App.open_for_reading(State.filename)

[5.143629]

[5.143683]

  local infile = App.open_for_reading(App.save_dir..State.filename)
  if not infile then
    infile = App.open_for_reading(App.source_dir..State.filename)
  end

Deletion in source_file.lua at line 33 [6.150304]

B:BD[6.150439] → [4.11:160]

BD:BD[6.150439] → [4.11:160]

B:BD[6.150574] → [4.161:243]

BD:BD[6.150574] → [4.161:243]

B:BD[6.150605] → [4.244:405]

BD:BD[6.150605] → [4.244:405]

  local infile = App.open_for_reading(App.save_dir..filename)
  if not infile then
    infile = App.open_for_reading(App.source_dir..filename)
  end
-- the source editor supports only files in the save dir backed by the source dir
  local infile = App.open_for_reading(App.save_dir..State.filename)
  if not infile then
    infile = App.open_for_reading(App.source_dir..State.filename)
  end

Solving an order conflict in source_file.lua at line 33 [6.150304]
[5.144049]
[8.10495]

Replacement in source_file.lua at line 47 [6.150304]

B:BD[5.144166] → [5.144166:144221]

  local outfile = App.open_for_writing(State.filename)

[5.144166]

[5.144221]

  local outfile = App.open_for_writing(App.save_dir..State.filename)

Deletion in source_file.lua at line 52 [6.150304]
B:BD[6.151404] → [4.406:475]
BD:BD[6.151404] → [4.406:475]
```
  local outfile = App.open_for_writing(App.save_dir..State.filename)
```
Solving an order conflict in source_file.lua at line 52 [6.150304]
[5.144346]
[8.10990]
Replacement in source_edit.lua at line 451 [6.152503]
B:BD[5.153139] → [5.153139:153169]
```
      App.setClipboardText(s)
```
[5.153139]
[5.153169]
```
      App.set_clipboard(s)
```
Replacement in source_edit.lua at line 457 [6.152503]
B:BD[5.153392] → [5.153392:153422]
```
      App.setClipboardText(s)
```
[5.153392]
[5.153422]
```
      App.set_clipboard(s)
```
Replacement in source_edit.lua at line 466 [6.152503]
B:BD[5.153818] → [5.153818:153868]
```
    local clipboard_data = App.getClipboardText()
```
[5.153818]
[5.153868]
```
    local clipboard_data = App.get_clipboard()
```
Deletion in source_edit.lua at line 480 [6.152503]
B:BD[5.154330] → [9.332:332]
B:BD[6.161971] → [4.477:504]
BD:BD[6.161971] → [4.477:504]
B:BD[6.162224] → [4.505:532]
BD:BD[6.162224] → [4.505:532]
B:BD[6.162650] → [4.533:580]
BD:BD[6.162650] → [4.533:580]
```
      App.set_clipboard(s)
      App.set_clipboard(s)
    local clipboard_data = App.get_clipboard()
```
Solving an order conflict in source_edit.lua at line 480 [6.152503]
[5.154330]
[8.21762]
Replacement in edit.lua at line 342 [11.413]
B:BD[10.140995] → [10.140995:141025]
```
      App.setClipboardText(s)
```
[10.140995]
[10.141025]
```
      App.set_clipboard(s)
```
Replacement in edit.lua at line 348 [11.413]
B:BD[10.141248] → [10.141248:141278]
```
      App.setClipboardText(s)
```
[10.141248]
[10.141278]
```
      App.set_clipboard(s)
```

Replacement in edit.lua at line 357 [11.413]

B:BD[10.141674] → [10.141674:141724]

    local clipboard_data = App.getClipboardText()

[10.141674]

[10.141724]

    local clipboard_data = App.get_clipboard()

Deletion in edit.lua at line 449 [11.413]
B:BD[10.144452] → [2.797:797]
B:BD[12.2709] → [13.407:454]
BD:BD[12.2709] → [13.407:454]
B:BD[11.13602] → [13.379:406]
BD:BD[11.13602] → [13.379:406]
B:BD[11.13365] → [13.351:378]
BD:BD[11.13365] → [13.351:378]
```
    local clipboard_data = App.get_clipboard()
      App.set_clipboard(s)
      App.set_clipboard(s)
```
Solving an order conflict in edit.lua at line 449 [11.413]
[10.144452]

Deletion in app.lua at line 263 [15.2]

B:BD[14.4156] → [3.36:211]

  return {
    write = function(self, s)
              App.filesystem[filename] = App.filesystem[filename]..s
            end,
    close = function(self)
            end,
  }

Resurrecting zombie bytes in app.lua at line 386 [15.2]
B:B[16.8162] → [17.1227:1277]
BD:B[16.8162] → [17.1227:1277]
```
  App.open_for_reading =
      function(filename)
```
Replacement in app.lua at line 388 [15.2]
B:BD[17.1277] → [17.1277:1334]
BD:BD[17.1277] → [17.1277:1334]
```
        local result = love.filesystem.newFile(filename)
```
[17.1277]
[17.1334]
```
        local result = nativefs.newFile(filename)
```
Replacement in app.lua at line 398 [15.2]
B:BD[17.1528] → [17.1528:1585]
BD:BD[17.1528] → [17.1528:1585]
```
        local result = love.filesystem.newFile(filename)
```
[17.1528]
[17.1585]
```
        local result = nativefs.newFile(filename)
```

Deletion in app.lua at line 406 [15.2]

B:BD[17.1729] → [5.157545:157545]

BD:BD[17.1729] → [5.157545:157545]

B:BD[16.8029] → [18.16028:16250]

BD:BD[16.8029] → [18.16028:16250]

B:BD[19.636] → [18.16251:16483]

BD:BD[19.636] → [18.16251:16483]

B:BD[19.907] → [18.16484:16494]

BD:BD[19.907] → [18.16484:16494]

  App.open_for_reading =
      function(filename)
        local result = nativefs.newFile(filename)
        local ok, err = result:open('r')
        if ok then
          return result
        else
          return ok, err
      end
  App.open_for_writing =
      function(filename)
        local result = nativefs.newFile(filename)
        local ok, err = result:open('w')
        if ok then
          return result
        else
          return ok, err
      end

Resurrecting zombie bytes in app.lua at line 406 [15.2]

B:B[18.16494] → [18.16494:16700]

BD:B[18.16494] → [18.16494:16700]

∅:∅[18.16700] → [13.880:1018]

B:B[19.913] → [13.880:1018]

BD:B[19.913] → [13.880:1018]

  App.files = nativefs.getDirectoryItems
  App.source_dir = love.filesystem.getSource()..'/'
  App.current_dir = nativefs.getWorkingDirectory()..'/'
  App.save_dir = love.filesystem.getSaveDirectory()..'/'
  App.get_time = love.timer.getTime
  App.get_clipboard = love.system.getClipboardText
  App.set_clipboard = love.system.setClipboardText

Solving an order conflict in app.lua at line 406 [15.2]
[17.1729]
[18.16494]

Merge text.love

Dependencies

In channels

Change contents

Replacement in source_file.lua at line 4 [6.150304]

Insertion in source_file.lua at line 16 [6.150304]

Replacement in source_file.lua at line 18 [6.150304]

Deletion in source_file.lua at line 33 [6.150304]

Solving an order conflict in source_file.lua at line 33 [6.150304]

Replacement in source_file.lua at line 47 [6.150304]

Deletion in source_file.lua at line 52 [6.150304]

Solving an order conflict in source_file.lua at line 52 [6.150304]

Replacement in source_edit.lua at line 451 [6.152503]

Replacement in source_edit.lua at line 457 [6.152503]

Replacement in source_edit.lua at line 466 [6.152503]

Deletion in source_edit.lua at line 480 [6.152503]

Solving an order conflict in source_edit.lua at line 480 [6.152503]

Replacement in edit.lua at line 342 [11.413]

Replacement in edit.lua at line 348 [11.413]

Replacement in edit.lua at line 357 [11.413]

Deletion in edit.lua at line 449 [11.413]

Solving an order conflict in edit.lua at line 449 [11.413]

Deletion in app.lua at line 263 [15.2]

Resurrecting zombie bytes in app.lua at line 386 [15.2]

Replacement in app.lua at line 388 [15.2]

Replacement in app.lua at line 398 [15.2]

Deletion in app.lua at line 406 [15.2]

Resurrecting zombie bytes in app.lua at line 406 [15.2]

Solving an order conflict in app.lua at line 406 [15.2]