From 533bbedd817afac2b085494ac7eafc084e6407d8 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 7 Oct 2010 23:38:34 -0400 Subject: [PATCH] Sync - Softened the wording in an error message. - Added WARNING commends to the Config sample. --- src/Config.cpp | 3 +++ src/TDB.cpp | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index d6d4b373f..35a0503c3 100644 --- a/src/Config.cpp +++ b/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" diff --git a/src/TDB.cpp b/src/TDB.cpp index 35b57523a..3545392ac 100644 --- a/src/TDB.cpp +++ b/src/TDB.cpp @@ -85,8 +85,7 @@ void readTaskmods (std::vector &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