From mboxrd@z Thu Jan 1 00:00:00 1970 From: Myles English Subject: Re: advice needed: how do you guys sync org files between devices? Date: Tue, 02 Jul 2013 10:43:45 +0100 Message-ID: <87y59pfga6.fsf@gmail.com> References: <2013-07-01T19-47-18@devnull.Karl-Voit.at> <2013-07-02T10-01-21@devnull.Karl-Voit.at> <8761wtjppi.fsf@pank.eu> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Utx54-0001n5-Hn for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 05:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Utx52-0000YS-8E for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 05:41:02 -0400 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:46158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Utx51-0000VT-TB for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 05:41:00 -0400 Received: by mail-wi0-f174.google.com with SMTP id k10so4000758wiv.1 for ; Tue, 02 Jul 2013 02:40:58 -0700 (PDT) In-reply-to: <8761wtjppi.fsf@pank.eu> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Rasmus Cc: emacs-orgmode@gnu.org Hi, Rasmus writes: > Another option is Git Annex. In my experience, it takes some effort > to get used to it, but perhaps less so if you're used to git. One can > configure it to use regular git for e.g. text files. It's build with > Haskell (and success of building it is more or less random), but the > author now provides binary packages for 32 and 64 bits. And git-annex is supported by the org attachment features, the author of git-annex, Joey Hess, has also written a tool called 'mr'. I sync between computers on a LAN and keep my org files in a git repo, and the attachment directory, named 'data' by default, is another git repo. To sync both of these repos at the same time, they are collected together in a .mrconfig file like this: [DEFAULT] lib = syncOrg() { git commit -a -m update || true git pull pi master git push pi master } [org] update = syncOrg [org/data] update = syncOrg other git repos can be added of course. These pull and push to/from a bare repos on a RaspberryPi that is always on. There are some things that I wish worked better and I feel could be improved: 1) when you add a repo (e.g. adding an attachment to an attachment will result in a nested repo because an attachment isn't self-aware) the corresponding bare repo must be added to the .mrconfig and the RaspPI. 2) git log shows lots of commit messages in the master branch that say "Merge branch 'master' of pi:org/etc" or "update" and so "Made some really important changes" becomes buried in the log. I have a feeling that this could be fixed by using a separate branch for syncing, but there would still be a merge commit message. Myles