Artifact [05215b0c50]

Artifact 05215b0c50e46be400e15c661a92b5ec8fb7f4035b227ac5d4c01fbdcbc486fc:

• File internal/merge/strategy.go — part of check-in [f5744359d3] at 2026-04-19 16:30:54 on branch trunk — Initial open source release

  libfossil is a pure-Go implementation of the Fossil SCM, reading and writing the same .fossil SQLite repository format as upstream Fossil.

  This is the first public release of code that previously lived in a private repository. The module path is github.com/danmestas/libfossil and the binary is named libfossil to avoid $PATH collisions with upstream fossil.

  Included: - Repo lifecycle (create, clone), checkout/checkin, timeline, merge, diff, annotate, shun, tag, branch, bisect, stash, undo/redo - Sync-over-HTTP protocol (client and handler) - Two SQLite drivers: modernc (pure Go, default) and ncruces (wasm-capable) - Observer interfaces (SyncObserver, CheckoutObserver) with an optional OpenTelemetry implementation in observer/otel (separate submodule) - Deterministic simulation testing harness with BUGGIFY fault injection - Kong-based embeddable CLI under cli/ and a standalone binary under cmd/libfossil/ (user: [email protected], size: 1076) [annotate] [blame] [check-ins using]

package merge

import libfossil "github.com/danmestas/libfossil/internal/fsltype"

// Strategy merges three versions of content.
type Strategy interface {
	Name() string
	Merge(base, local, remote []byte) (*Result, error)
}

// Result of a merge operation.
type Result struct {
	Content   []byte     // merged output (may contain conflict markers)
	Conflicts []Conflict // unresolved conflict regions
	Clean     bool       // true if no conflicts
}

// Conflict describes one conflicting region.
type Conflict struct {
	StartLine int
	EndLine   int
	Local     []byte
	Remote    []byte
	Base      []byte
}

// Fork represents two divergent checkins sharing a common ancestor.
type Fork struct {
	Ancestor  libfossil.FslID
	LocalTip  libfossil.FslID
	RemoteTip libfossil.FslID
}

// StrategyByName returns a strategy implementation by name.
func StrategyByName(name string) (Strategy, bool) {
	s, ok := strategies[name]
	return s, ok
}

var strategies = map[string]Strategy{}

// Register adds a strategy to the registry.
func Register(s Strategy) {
	strategies[s.Name()] = s
}