mirror of
https://github.com/dolthub/dolt.git
synced 2026-03-13 19:29:58 -05:00
* Add Hash160Enc * persist and read conflicts from merge artifacts table * update some tests * [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh * comment / cleanup prolly/artifact_map.go * ~copyright~ * reskip TestDoltMerge * rename Hash160Enc to Address * change ArtifactType from string to uint8 * fix zero value for ArtifactType * merge sets of conflicts together, update some tests * [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh * pr comments * cvs can be written to and read * merge with CVs for new storage format * working! * skip cv test * unskips dolt transaction tests * [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh * some cleanup, fix tests * [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh * copyright * fix cv hash roundtripping * pr comments * [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh * cleanup * fix vet errors and tests Co-authored-by: druvv <druvv@users.noreply.github.com>