Merged PRs
dolt
- 11006: Preserve tables absent from the index during
checkout,reset, andrebase
Tables present only in the working tree (never added to staging) were being deleted or incorrectly staged by the three commands.- Scope
checkout .table list to HEAD and staged root - Update working and staged roots independently in the specific-table checkout case
- Add
MoveUntrackedTableshelper for the working-tree preservation step in reset--hardand
rebase - Apply rebase preservation via direct
UpdateWorkingSetbeforeSwitchWorkingSet - Fix
dolt reset --soft <rev>to leave the index untouched - Rename
ResetSoftToReftoMoveHeadToRefandresetSoftToReftoresetMixedToRefso names match
behavior
- Scope
- 11002: When
dolt diff -r sqlencounters a schema change, it should either print the full diff or return an error
Previously, whenever a table had a schema change,dolt diff -r sqlwould skip printing the data diff for that table. It would print a message to stderr, but still return a 0 error code. This is misleading, especially if the diff command is called by an automated process.
This PR improves the situations where we successfully render the data diff. In situations where we can't, we return a nonzero error code.