Sync

- Softened the wording in an error message.
- Added WARNING commends to the Config sample.

src/Config.cpp

@@ -233,6 +233,9 @@ std::string Config::defaults =
   "shell.prompt=task>                             # Prompt used by the shell command\n"
   "\n"
 	"# Merge options\n"
+  "#\n"
+  "# WARNING: Please read the documentation (man task-sync) before proceeding with these\n"
+  "#          synchronization features.  Improperly used, data can be lost!\n"
 	"merge.autopush=ask                             # Push database to remote origin after merge: yes, no, ask\n"
 	"#merge.default.uri=user@host.xz:.task/         # URI for merge\n"
 	"#pull.default.uri=rsync://host.xz/task-backup/ # URI for pull\n"

src/TDB.cpp

@@ -85,8 +85,7 @@ void readTaskmods (std::vector <std::string> &input,
       stream >> ts;
 
       if (stream.fail ())
-        throw std::string ("Failed to convert \"" + stream.str ()
-                         + "\" to integer: " + tmod_tmp.getTimeStr () + ".");
+        throw std::string ("There was a problem reading the timestamp from the undo.data file.");
 
       // 'time' is the first line of a modification
       // thus we will (re)set the taskmod object