* add bats test to check that merges can succeed in a conflicted state
fix tests
* add skipped bats for merges that violate check constraints post-merge
* add types.UnionMaps
* caller can choose value when key collision occurs
* fix comment
* allow merges when conflicts or violations are committed
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* skip bats on new format
* enginetest -> queries
* last bats fix
* more bats
* missing run in bats
* pr edits
Co-authored-by: druvv <druvv@users.noreply.github.com>
* Read replica update working set fixes
Read replica pull updates the session working set after pulling a
filtered set of branches from the tracking database. The original
(buggy) implementation updates the working set to the branch specified
at server-start time. The identity of that branch was fixed for the
duration of the server, so dolt_checkout would (appear to) have no
effect on the new branch's working set. What actually happened was more
pernicious: the working set was updated to the value of the
incorrect branch.
The fix no longer statically sets the active branch for a read replica
database. The active branch is pulled from the `*sql.Context`, so the
correct working set will be updated.
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* add test
* todos
* delete extraeneous line
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
* [no-release-notes] New enginetest harness
* touch ups
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* missing dep
* fix new storage engine tests
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* missing go.sum
* refactor setup package
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* refactor setup package again
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
