You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This commit was created on GitHub.com and signed with GitHub’s verified signature.
The key has expired.
Bring doltcli up to date with dolt 1.16.0 (#44)
* Mark expected failure of `test_working`
* Add typing for `create_test_table` fixture
* Add typing for `init_empty_test_repo` fixture
* Add `ORDER BY` clause to make test reliable
* `test_merge_conflict` has incorrect logic
* Fix fixture to set up a doltdb
* Remove unused mixin file
* Add `track` argument to checkout
* Add option to specify the branch to pull from
* Fix unit tests by updating `Branch` type
* Fix merge function message parsing
Wrong parsing of merge output was causing test_merge_fast_forward to
fail
* Add fix for test_update_rows
This will be removed once issue with dolt table import -u is fixed
https://github.com/dolthub/dolt/issues/6675
* Add commit message to merge dolt command
Improve merge docstring
This fixes test_dolt_log_merge_commit test as now merge message is
correctly used
* Remove unreachable code in merge
This code was never reach as --commit flag was always set by default
in dolt merge command
* Improve use of commit message variable in tests
* Add recommended dolt version in README
* Add remote and all options to branch
* Update dolt version to 0.16.0
* Remove temporary csv import fix as solved in dolt
* Simplify _get_branches
* Add tests for pull command
* Add tests for _get_branches
---------
Co-authored-by: crisp-snakey <b.dejong@lumicks.com>
Co-authored-by: radao <a.radice@lumicks.com>
Co-authored-by: Tommaso <tommaso.gritti@gmail.com>