From 02cef2da23b022cf2703fdf856fdf00b452d67fb Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Thu, 23 Jun 2016 22:02:39 -0700 Subject: history --merge to properly interleave items Fixes #2312 --- src/history.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/history.cpp') diff --git a/src/history.cpp b/src/history.cpp index 48469759..44c153a5 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -1548,6 +1548,12 @@ void history_t::incorporate_external_changes() { if (new_timestamp > this->boundary_timestamp) { this->boundary_timestamp = new_timestamp; this->clear_file_state(); + + // We also need to erase new_items, since we go through those first, and that means we + // will not properly interleave them with items from other instances. + // We'll pick them up from the file (#2312) + this->save_internal(false); + this->new_items.clear(); } } -- cgit v1.2.3