Feature #1423

- #1423 sync vs. push, pull, merge collision avoidance.
2013-11-03 12:04:21 -05:00
parent 56d8734e1a
commit 8c9bc99af6
7 changed files with 13 additions and 13 deletions
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -78,6 +78,13 @@ int CmdSync::execute (std::string& output)
      connection.rfind (':') == std::string::npos)
    throw std::string (STRING_CMD_SYNC_NO_SERVER);

+  // If push/pull/merge is configured, quit.
+  if (context.config.get ("merge.autopush")    != "" ||
+      context.config.get ("merge.default.uri") != "" ||
+      context.config.get ("push.default.uri")  != "" ||
+      context.config.get ("pull.default.uri")  != "")
+    throw std::string (STRING_CMD_SYNC_NOMERGE);
+
  // Obtain credentials.
  std::string credentials_string = context.config.get ("taskd.credentials");
  if (credentials_string == "")