beads-merge: Use go-cmp library for deep equality comparison

Copilot · neongreen · Copilot · commit b842593a9174 · 2025-10-19T22:40:55.000Z
Co-authored-by: neongreen &lt;1523306+neongreen@users.noreply.github.com&gt;
diff --git a/beads-merge/go.mod b/beads-merge/go.mod
@@ -1,3 +1,5 @@
 module github.com/neongreen/mono/beads-merge
 
 go 1.24.7
+
+require github.com/google/go-cmp v0.7.0 // indirect
diff --git a/beads-merge/go.sum b/beads-merge/go.sum
@@ -0,0 +1,2 @@
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
diff --git a/beads-merge/main.go b/beads-merge/main.go
@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"os"
 	"time"
+
+	"github.com/google/go-cmp/cmp"
 )
 
 // Issue represents a beads issue with all possible fields
@@ -361,9 +363,10 @@ func hasConflict(base, left, right, merged Issue) bool {
 }
 
 func issuesEqual(a, b Issue) bool {
-	aJSON, _ := json.Marshal(a)
-	bJSON, _ := json.Marshal(b)
-	return string(aJSON) == string(bJSON)
+	// Use go-cmp for deep equality comparison, ignoring RawLine field
+	return cmp.Equal(a, b, cmp.FilterPath(func(p cmp.Path) bool {
+		return p.String() == "RawLine"
+	}, cmp.Ignore()))
 }
 
 func makeConflict(left, right string) string {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=`
	`2`	`+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"os"`
`8`	`8`	`"time"`
	`9`	`+`
	`10`	`+ "github.com/google/go-cmp/cmp"`
`9`	`11`	`)`
`10`	`12`
`11`	`13`	`// Issue represents a beads issue with all possible fields`
`@@ -361,9 +363,10 @@ func hasConflict(base, left, right, merged Issue) bool {`
`361`	`363`	`}`
`362`	`364`
`363`	`365`	`func issuesEqual(a, b Issue) bool {`
`364`		`- aJSON, _ := json.Marshal(a)`
`365`		`- bJSON, _ := json.Marshal(b)`
`366`		`- return string(aJSON) == string(bJSON)`
	`366`	`+ // Use go-cmp for deep equality comparison, ignoring RawLine field`
	`367`	`+ return cmp.Equal(a, b, cmp.FilterPath(func(p cmp.Path) bool {`
	`368`	`+ return p.String() == "RawLine"`
	`369`	`+ }, cmp.Ignore()))`
`367`	`370`	`}`
`368`	`371`
`369`	`372`	`func makeConflict(left, right string) string {`