Handle SolveOrderConflict hunks

andybalholm

Apr 2, 2023, 1:16 AM

A7XMU2A6FOHZKKFXFMQNJ7MEQ67IQTWYOZJAECP3NZIOZ2CCDANAC

Dependencies

• [2] 7D7CMNN3 Handle Edit hunks
• [3] EYPCPIP7 Apply changes and build a graph
• [4] OYWKC4LZ tijo-graph: direct SVG output
• [*] EVHNGDT7 parse FileAdd hunk
• [*] TLR47XSA Parse AddRoot hunk

Change contents

• edit in hunk.go at line 193
  [2.1351]

  [7.0]
  + case 8:

  + return solveOrderConflict(data)
• edit in hunk.go at line 280
  [2.1802]

  [2.1802]
  + }

  +

  + type SolveOrderConflict struct {

  + Change Atom

  + Local Local

  + }

  +

  + func (s SolveOrderConflict) atoms() []Atom {

  + return []Atom{s.Change}

  + }

  +

  + func solveOrderConflict(data []byte) ([]byte, SolveOrderConflict, error) {

  + var s SolveOrderConflict

  + data, _, err := tuple(

  + assign(&s.Change, atom),

  + assign(&s.Local, local),

  + )(data)

  + return data, s, err
• replacement in cmd/tijo-graph/main.go at line 149
  [3.15736]→[3.15736:15746](∅→∅)
  − case 1:
  [3.15736]

  [3.15746]
  + case 0, 1: