From b8a3c1b5656f9da61a08e49ca943488cefa1d724 Mon Sep 17 00:00:00 2001 From: Johannes Schlatow Date: Sat, 7 Aug 2010 17:49:17 +0200 Subject: [PATCH] Man pages - Added documentation of merge commmand to task.1 and task-faq.5 --- doc/man/task-faq.5 | 19 +++++++++++++++++++ doc/man/task.1 | 5 +++++ 2 files changed, 24 insertions(+) diff --git a/doc/man/task-faq.5 b/doc/man/task-faq.5 index c3d9d0b46..1449fab2e 100644 --- a/doc/man/task-faq.5 +++ b/doc/man/task-faq.5 @@ -153,6 +153,24 @@ modifying the: configuration variable. Check out DropBox at http://www.dropbox.com. +.TP +.B Q: I don't like dropbox. Is there another way to synchronize my tasks? +Of course. Especially if you want to modify tasks offline on both machines and +synchronize them later on. For this purpose task provides a 'merge' command which +is able to insert the modifications you made to one of your task databases into a +second database. + +Here is a basic example of the procedure: + + $ rsync myremotehost:.task/undo.data /tmp/undo_remote.data + $ task merge /tmp/undo_remote.data + $ rsync ${HOME}/.task/*.data myremotehost:.task/ + +First you need to get the undo.data file from the remote system with a network +protocol of your choice or a removable medium as well. When task finished the merge +command you should copy all the local .data files to the remote system. This way you +ensure that both systems are fully synchronized. + .TP .B Q: The undo.data file gets very large - do I need it? You need it if you want the undo capability. But if it gets large, you can @@ -286,6 +304,7 @@ non-exact match: This will remove the second annotation - the first non-exact match. + .SH "CREDITS & COPYRIGHTS" task was written by P. Beckingham . .br diff --git a/doc/man/task.1 b/doc/man/task.1 index f23b6c053..57b1d252a 100644 --- a/doc/man/task.1 +++ b/doc/man/task.1 @@ -142,6 +142,11 @@ Redirect the output to a file, if you wish to save it, or pipe it to another com Exports all tasks in YAML 1.1 format. Redirect the output to a file, if you wish to save it, or pipe it to another command. +.TP +.B merge path/to/remote/undo.data +Merges two task databases by comparing the modifications that are stored in the +undo.data files. The location of the second undo.data file must be passed on as argument. + .TP .B color [sample | legend] Displays all possible colors, a named sample, or a legend containing all