Commit Graph

22 Commits

Author SHA1 Message Date
Daylon Wilkins
8aeb1c659e Removed deprecated dolt functions 2023-01-03 02:13:37 -08:00
Aaron Son
509accded5 SQL: DOLT_CHECKOUT: Support checking out a branch which does not have an associated working set. 2022-09-08 16:33:02 -07:00
Tan Yong Zhi
53e6e19c4a Fix even more tests 2022-08-26 12:14:05 +08:00
jennifersp
6886a8721f commit merge if no conflict (#4105) 2022-08-23 12:38:12 -07:00
Dhruv Sringari
24cac1f6c4 [no-release-notes] unskip more bats (#3737)
* Fix merge test for __DOLT_1__

* tree.ThreeWayMerge always calls callback when key collision occurs

* add keyless support for new format merge and other merge related tables

* newline of doom

* unskip more bats

* empty

* skip blame.bats and remotes-aws.bats
2022-07-01 17:00:42 -07:00
Daylon Wilkins
178259995b Unskipped bats tests 2022-06-21 04:03:39 -07:00
Andy Arthur
01587c8c20 more BATS skips for __DOLT_1__ 2022-05-10 14:08:47 -07:00
Maximilian Hoffman
9154d2e5dd short dolt procs (#3369) 2022-05-06 18:42:13 -07:00
Zach Musgrave
ad7f5b9525 Added additional test for CALL DOLT_CHECKOUT which was broken when a transaction was in progress 2022-05-03 15:14:41 -07:00
Daylon Wilkins
7fe4d7d780 Added stored procedure versions of dolt functions 2022-04-19 03:44:20 -07:00
Zach Musgrave
0a11d1d89c Removed --disable-batch flag from all bats tests 2022-01-25 11:52:04 -08:00
Timothy Sehn
92366d8d77 Added assertion that the branch is created 2021-12-07 15:10:01 -08:00
Timothy Sehn
7f83092992 Changed test to reflect current behavior and added a comment 2021-12-07 15:05:32 -08:00
Timothy Sehn
5ec1778b78 Modified bats for SQL checkout to be skipped. SQL Checkout does not change the branch in command line context. 2021-12-07 14:53:33 -08:00
Dustin Brown
5371ed510f /integration-tests/bats: fix bats tests 2021-09-23 14:30:43 -07:00
Zach Musgrave
a367bda243 Fixed dolt_checkout to correctly update the head ref var, added a bats test 2021-07-29 16:24:35 -07:00
Zach Musgrave
5bdb94fb9e Fixed a bug in sql checkout test 2021-07-03 19:41:51 -07:00
Zach Musgrave
3783ade221 Fixed more tests, but still not working, probably because of errors in dolt_commit() 2021-07-03 12:12:41 -07:00
Zach Musgrave
25d5ee8c74 Fixed two dolt_checkout tests with new semantics 2021-07-03 10:57:24 -07:00
Zach Musgrave
e1b34fdc74 Updated tests for dolt_checkout(), exposed major problems in that implemntation 2021-07-02 12:43:43 -07:00
Vinai Rachakonda
d0e32f4cf1 Fixes already on same branch error (#1589)
Fixes bugs w/ dolt checkout and DOLT_CHECKOUT when checking out to the same branch
2021-04-27 10:34:13 -04:00
Dustin Brown
61b06450b1 /integration-tests: move bats 2021-03-15 14:04:40 -07:00