Artifact [4f20025f3c]

Artifact 4f20025f3c2132b35d0c9764f24083b2c9fd7b5025e7a3dcbea8f94fadd46fc8:

• File cli/repo_revert.go — part of check-in [7ea6fba63f] at 2026-10-06 15:57:25 on branch trunk — fix(checkout): merge the way fossil does, and commit merges with their parent (#244) (#252)

  The CLI's merge marked a conflict with vfile.chnged=5, which fossil reads as "added by integrate", and recorded no merge-in version or vmerge row, so a merge went unseen and the next commit dropped the merge parent.

  Merging now lives in the library as Checkout.Merge and records what fossil records: chnged=2 and mrid for a file taken from the merged-in version, chnged=3 for an added file, a per-file vmerge row for a merged file, and vmerge id 0 for the merge. Conflicts use fossil's markers and are found by looking for them (Checkout.Conflicts), so fossil and go-libfossil read each other's merges. Where fossil relies on its undo copy, Merge keeps the file or refuses instead.

  Commit reads vmerge for merge parents, and, as fossil's commit does, refuses unresolved conflict markers, empty commits, unknown names and partial commits of a merge. The CLI's merge, conflicts, mark-resolved and ci commands call the library; ci now commits the checkout. (user: [email protected], size: 734) [annotate] [blame] [check-ins using]

package cli

import (
	"fmt"

	libfossil "github.com/danmestas/go-libfossil"
)

// RepoRevertCmd restores files to their checked-out version.
type RepoRevertCmd struct {
	Files []string `arg:"" optional:"" help:"Files to revert (default: all)"`
	Dir   string   `short:"d" help:"Checkout directory" default:"."`
}

func (c *RepoRevertCmd) Run(g *Globals) (err error) {
	_, co, done, err := openWorkingCheckout(g, c.Dir)
	if err != nil {
		return err
	}
	defer closeWith(done, &err)

	if err := co.Revert(libfossil.RevertOpts{Files: c.Files}); err != nil {
		return err
	}
	if len(c.Files) == 0 {
		fmt.Println("reverted all changes")
		return nil
	}
	for _, name := range c.Files {
		fmt.Printf("REVERTED %s\n", name)
	}
	return nil
}