summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-02-02 13:38:54 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-02 13:38:54 +0100
commitf481bd4f30a00fa3d4a5b4aecd0f881b1f5b58f5 (patch)
tree79142665a6db406ae004101e39d715d2c0ef348c /test
parent6610afbf6a5e802fc15733d6a499281cd981af13 (diff)
merge_sth.py doesn't do the right thing when 'sth' is missing.erlmerge_backup
See CATLFISH-88, CATLFISH-89 for a discussion.
Diffstat (limited to 'test')
-rwxr-xr-xtest/scripts/light-system-test-prepare-merge-takeover.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/scripts/light-system-test-prepare-merge-takeover.sh b/test/scripts/light-system-test-prepare-merge-takeover.sh
index 085a6a2..67e5ac7 100755
--- a/test/scripts/light-system-test-prepare-merge-takeover.sh
+++ b/test/scripts/light-system-test-prepare-merge-takeover.sh
@@ -10,6 +10,7 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd)
mv mergedb mergedb-down
mv mergedb-secondary mergedb
init_log
+cp mergedb-down/sth mergedb/ # After init_log.
mkdir mergedb-secondary
touch mergedb-secondary/logorder
printf 0 > mergedb-secondary/verifiedsize