From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Horn Subject: Re: [SYNC] How do you sync your org-mode files between n devices (n > 2) Date: Thu, 05 Sep 2013 09:37:53 -0400 Message-ID: References: <20130904060424.GA679@kuru.dyndns-at-home.com> <499DE163-8785-4997-B6F4-1B4475FAD205@gmail.com> <20130904074317.GC679@kuru.dyndns-at-home.com> <20130905094234.GH19491@kuru.dyndns-at-home.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHZl5-0007zK-Eq for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 09:38:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHZkw-0006Iu-TM for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 09:38:03 -0400 Received: from mailbackend.panix.com ([166.84.1.89]:47824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHZkw-0006IT-PE for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 09:37:54 -0400 In-reply-to: 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: Alan Schmitt Cc: emacs-orgmode@gnu.org Alan Schmitt writes: > I can't promise anything, but I can try to write something. What > external merging tool should I use? > There was some work done in a Summer of Code last year or the year before. I don't know how much more work remains. It was an effort for a delta operator for git. I use a multi-system git environment, and the one area that is beyond the git capabilities at present is the following kind of problem: There is a repeating daily task with a log file. On machine A, the task is finished on Monday, Wednesday, and Friday. On machine B, the task is finished on Tuesday, Thursday, and Saturday. Git does not understand the task structure, nor does it understand date oriented logs. It recognizes that there is a stretch of logfile and task structure that needs my human intervention and leaves that part for me to fix. I have to cut the log entries from machine A version and put them into the log from machine B version in proper date order. The last complete and next lines will come from machine B because they are more recent. I understand the date orientation, task structure, etc. Git does not. Proper understanding of things like interleaving date related entries is a difficult task to get right. It would be enough to get it 80% right with 0% improper fixes, and 20% identified for human merging. But to reach this level means understanding all the different users of date tagged lines, entries, headlines, etc. in the org structure. R Horn