From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alan Schmitt <alan.schmitt@polytechnique.org>
Subject: Re: advice needed: how do you guys sync org files between devices?
Date: Tue, 02 Jul 2013 16:27:27 +0200
Message-ID: <m2ppv1avg0.fsf@polytechnique.org>
References: <CAOQHXPrecrtEQM4j5SNXrRCHe7dKhLsc6W0PmsRUwPmOaD7GPw@mail.gmail.com>
	<CAF6Daj+c=a8E2xjk73i=mYMxMiomkFWaPNMWCi3cmAXHOmj5bg@mail.gmail.com>
	<CAJMNdQ+K=HEfj0L7H2kOYD00Q8X=2w9mMMK_51Tti-0+MMWAvQ@mail.gmail.com>
	<2013-07-01T19-47-18@devnull.Karl-Voit.at>
	<m2a9m5csvf.fsf@polytechnique.org>
	<2013-07-02T10-01-21@devnull.Karl-Voit.at>
	<m2wqp9axsy.fsf@polytechnique.org> <87ppv1hx79.fsf@pank.eu>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59257)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1Uu1YI-0004dT-Dq
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 10:27:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1Uu1YG-0002MS-Nn
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 10:27:30 -0400
Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:59468)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1Uu1YG-0002M5-Hd
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 10:27:28 -0400
In-reply-to: <87ppv1hx79.fsf@pank.eu>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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 <rasmus@gmx.us>
Cc: emacs-orgmode@gnu.org

rasmus@gmx.us writes:

> Alan Schmitt <alan.schmitt@polytechnique.org> writes:
>
>>> Alan, how about a short how-to on Worg about Unison and Org-mode
>>> methods?
>>
>> Well, what would be there? If there is (and there may be) an external
>> tool that knows how to merge org files (it can be a 3-way merge, if it
>> makes things simpler), I could try to devise the magical incantation to
>> use it.
>
> There's the GSOC project from last year:
>
>      http://orgmode.org/cgit.cgi/org-merge-driver.git
>
> Whether it is complete or abandoned I don't know.  Here's the Worg
> page
>
>       http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/index.html

This looks nice. Has anyone tried it?

If someone can show me how to launch ediff from the command line, I can
explain how to set up Unison for it (I found this old question
http://superuser.com/questions/81958/how-to-make-emacsclient-wait-when-using-the-eval-option
but I find the busy waiting very ugly; maybe there is a better
solution).

Alan