mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 18:49:14 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Fixed error message

Browse Source
This commit is contained in:
Zach Musgrave
2023-04-27 14:08:06 -07:00
parent 01b40f62eb
commit f330119a94
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration-tests/bats/sql-merge.bats
View File

@@ -771,7 +771,7 @@ call dolt_merge('feature-branch');
SHOW WARNINGS;
SQL
log_status_eq 0
[[ "$output" =~ "current fast forward from a to b. a is ahead of b already" ]] || false
[[ "$output" =~ "cannot fast forward from a to b. a is ahead of b already" ]] || false
}
@test "sql-merge: up-to-date branch does not error on CALL" {
@@ -785,7 +785,7 @@ CALL DOLT_MERGE('feature-branch');
SHOW WARNINGS;
SQL
log_status_eq 0
[[ "$output" =~ "current fast forward from a to b. a is ahead of b already" ]] || false
[[ "$output" =~ "cannot fast forward from a to b. a is ahead of b already" ]] || false
}
@test "sql-merge: adding and dropping primary keys any number of times not produce schema merge conflicts" {