From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Alan E. Davis" Subject: syncing org-mode files on three unconnected machines? Date: Mon, 9 Feb 2009 13:43:57 +1000 Message-ID: <7bef1f890902081943n2417dde4uc923053fdf279a47@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1875962868==" Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LWN3z-0004tI-Lv for emacs-orgmode@gnu.org; Sun, 08 Feb 2009 22:44:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LWN3w-0004qp-2Z for emacs-orgmode@gnu.org; Sun, 08 Feb 2009 22:44:02 -0500 Received: from [199.232.76.173] (port=56344 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LWN3v-0004qm-Pw for emacs-orgmode@gnu.org; Sun, 08 Feb 2009 22:43:59 -0500 Received: from rv-out-0708.google.com ([209.85.198.243]:64750) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LWN3v-0002mP-6F for emacs-orgmode@gnu.org; Sun, 08 Feb 2009 22:43:59 -0500 Received: by rv-out-0708.google.com with SMTP id k29so2026747rvb.6 for ; Sun, 08 Feb 2009 19:43:57 -0800 (PST) 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 Mailinglist --===============1875962868== Content-Type: multipart/alternative; boundary=001636e90d462c9ad70462742e52 --001636e90d462c9ad70462742e52 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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 -- Alan Davis It is undesirable to believe a proposition when there is no ground whatsoever for supposing it is true. ---- Bertrand Russell They are ill discoverers that think there is no land, when they can see nothing but sea. ---- Sir Francis Bacon --001636e90d462c9ad70462742e52 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I am studying and using git in several ways at work and at home, and hope t= o dive further into the agenda possibilities.  I have been using org-m= ode at work, on two machines, as well as at home, on my preferred main mach= ine.  I also would like to run emacs and org-mode sometimes on a lapto= p.  I am not currently able to network or internetwork between them, d= ue to various firewall and wireless router issues that are beyond my level.=

My question is basically how to keep the files consistent among the var= ious machines.  I have thought of at least two ways, but don't und= erstand 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 pastin= g 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)?<= br>
2.  I am thinking git.  I'm uncertain about git at the be= st, so I don't know how to implement this.  Is this reasonable?&nb= sp; A git archive is kept on a flash drive.  It is updated from the dr= ive of the current machine.  ~/org on the current machine is also upda= ted  from the git archive on the flash drive. 

I am currently struggling to get git working on all my ~/org trees.&nbs= p; Also, I have set some files outside that tree as remember targets or wit= h links to be access from git files.  Somehow, those files will have t= o be hardlinked on both or all three machines, meaning the machines will ha= ve to mirror each other. 

Somehow, any solution to this problem will need to be robust when I for= get my flash drive. 

Am I dreaming?

Thank you,

A= lan


--
Alan Davis

It is undesirable to= believe a proposition when
there is no ground whatsoever for supposing it is true.
    -= --- Bertrand Russell
They are ill discoverers that think there is no la= nd, when they can see nothing but sea.
    ----   Sir Fr= ancis Bacon

--001636e90d462c9ad70462742e52-- --===============1875962868== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Remember: use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --===============1875962868==--