From f481bd4f30a00fa3d4a5b4aecd0f881b1f5b58f5 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Thu, 2 Feb 2017 13:38:54 +0100
Subject: merge_sth.py doesn't do the right thing when 'sth' is missing.

See CATLFISH-88, CATLFISH-89 for a discussion.
---
 test/scripts/light-system-test-prepare-merge-takeover.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test')

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
-- 
cgit v1.1