mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-15 00:50:22 -06:00
Code Issues Packages Projects Releases 132 Wiki Activity

Added a test for merging two branches that both create different tables

Browse Source
This commit is contained in:
Timothy Sehn
2019-05-09 12:20:50 -07:00
parent 28f10144e0
commit 96d32518f4
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bats/create-tables.bats
View File

@@ -324,3 +324,22 @@ teardown() {
[[ "$output" =~ "unsupported characters" ]] || false
}
@test "two branches both create different tables. merge. no conflict" {
dolt branch table1
dolt branch table2
dolt checkout table1
dolt table create -s=$BATS_TEST_DIRNAME/helper/1pk5col-ints.schema table1
dolt add table1
dolt commit -m "first table"
dolt checkout table2
dolt table create -s=$BATS_TEST_DIRNAME/helper/2pk5col-ints.schema table2
dolt add table2
dolt commit -m "second table"
dolt checkout master
run dolt merge table1
[ "$status" -eq 0 ]
[[ "$output" =~ "Fast-forward" ]] || false
run dolt merge table2
[ "$status" -eq 0 ]
[[ "$output" =~ "Updating" ]] || false
}

1
bats/remotes.bats
View File

@@ -279,6 +279,7 @@ teardown() {
dolt commit -m "another test commit"
run dolt pull origin
[ "$status" -eq 0 ]
[[ "$output" =~ "Updating" ]] || false
}
@test "generate a merge with a conflict with a remote branch" {