Add CLI --dry-run option for merge (#3254)

2019-06-18 21:45:24 -04:00
parent 9e06dc0d5c
commit 84eec03cb7
9 changed files with 98 additions and 35 deletions
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -894,9 +894,9 @@ void DatabaseWidget::mergeDatabase(bool accepted)
        }

        Merger merger(srcDb.data(), m_db.data());
-        bool databaseChanged = merger.merge();
+        QStringList changeList = merger.merge();

-        if (databaseChanged) {
+        if (!changeList.isEmpty()) {
            showMessage(tr("Successfully merged the database files."), MessageWidget::Information);
        } else {
            showMessage(tr("Database was not modified by merge operation."), MessageWidget::Information);