From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Volpiatto Subject: Re: syncing org-mode files on three unconnected machines? Date: Mon, 09 Feb 2009 08:22:23 +0100 Message-ID: <87d4ds13dc.fsf@tux.homenetwork> References: <7bef1f890902081943n2417dde4uc923053fdf279a47@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LWQkS-0001Gd-Ed for emacs-orgmode@gnu.org; Mon, 09 Feb 2009 02:40:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LWQkQ-0001GR-Un for emacs-orgmode@gnu.org; Mon, 09 Feb 2009 02:40:08 -0500 Received: from [199.232.76.173] (port=39231 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LWQkQ-0001GO-SE for emacs-orgmode@gnu.org; Mon, 09 Feb 2009 02:40:06 -0500 Received: from main.gmane.org ([80.91.229.2]:49937 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LWQkQ-0007Kd-IT for emacs-orgmode@gnu.org; Mon, 09 Feb 2009 02:40:06 -0500 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1LWQkM-0007qW-Ae for emacs-orgmode@gnu.org; Mon, 09 Feb 2009 07:40:02 +0000 Received: from 159.211.85-79.rev.gaoland.net ([79.85.211.159]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 09 Feb 2009 07:40:02 +0000 Received: from thierry.volpiatto by 159.211.85-79.rev.gaoland.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 09 Feb 2009 07:40:02 +0000 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Hi, You can use git or mercurial (or other decentralized VC) to do that. I use hg (mercurial). To achieve that, you can do like that: 1) Initialize a repo in org-tree1 2) Clone org-tree1 to org-tree2 and org-tree3 (on the machine1) 2) Put these three org-tree on your usb-key 3) Put these three org-tree on the machine 2 and 3. Thats all! Now on any machine you can edit org-tree1, make changes, and just pull changes from org-tree2 and 3. If you have your usb-key with you, pull the change from the key, if not, you will do it later and synchronize with the key on other machines. For a better experience, use DVC with hg or git. "Alan E. Davis" writes: > I am studying and using git in several ways at work and at home, and hope to > dive further into the agenda possibilities. I have been using org-mode at > work, on two machines, as well as at home, on my preferred main machine. I > also would like to run emacs and org-mode sometimes on a laptop. I am not > currently able to network or internetwork between them, due to various > firewall and wireless router issues that are beyond my level. > > My question is basically how to keep the files consistent among the various > machines. I have thought of at least two ways, but don't understand whether > either of them will work: > > 1. I am now carrying around a USB flash drive with three ~/org trees from > three machines. I have been trying to maintain important files by hand: > cutting and pasting headlines and their subtrees, then sorting the entire > target file. Is there a canonical method for merging two files (basically > the same file on two different machines, edited at different times, with > some overlaps)? > > 2. I am thinking git. I'm uncertain about git at the best, so I don't know > how to implement this. Is this reasonable? A git archive is kept on a > flash drive. It is updated from the drive of the current machine. ~/org on > the current machine is also updated from the git archive on the flash > drive. > > I am currently struggling to get git working on all my ~/org trees. Also, I > have set some files outside that tree as remember targets or with links to > be access from git files. Somehow, those files will have to be hardlinked > on both or all three machines, meaning the machines will have to mirror each > other. > > Somehow, any solution to this problem will need to be robust when I forget > my flash drive. > > Am I dreaming? > > Thank you, > > Alan -- A + Thierry Volpiatto Location: Saint-Cyr-Sur-Mer - France