gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Sync

Browse Source 
- Softened the wording in an error message.
- Added WARNING commends to the Config sample.
This commit is contained in:
Paul Beckingham
2010-10-07 23:38:34 -04:00
parent 42521fea8b
commit 533bbedd81
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Config.cpp
View File

@@ -233,6 +233,9 @@ std::string Config::defaults =
"shell.prompt=task> # Prompt used by the shell command\n" "shell.prompt=task> # Prompt used by the shell command\n"
"\n" "\n"
"# Merge options\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.autopush=ask # Push database to remote origin after merge: yes, no, ask\n"
"#merge.default.uri=user@host.xz:.task/ # URI for merge\n" "#merge.default.uri=user@host.xz:.task/ # URI for merge\n"
"#pull.default.uri=rsync://host.xz/task-backup/ # URI for pull\n" "#pull.default.uri=rsync://host.xz/task-backup/ # URI for pull\n"

3
src/TDB.cpp
View File

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