From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Git merge tool for Org files Date: Sat, 20 Aug 2011 16:42:45 +0200 Message-ID: References: <2DC59D99-FACF-40A2-9914-182C6224BD76@gmail.com> <4E4FC20F.7090101@gmail.com> Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([140.186.70.92]:45503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QumlA-0003YV-EW for emacs-orgmode@gnu.org; Sat, 20 Aug 2011 10:42:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Quml9-0004TH-0j for emacs-orgmode@gnu.org; Sat, 20 Aug 2011 10:42:52 -0400 Received: from mail-ey0-f171.google.com ([209.85.215.171]:38096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Quml8-0004TA-SF for emacs-orgmode@gnu.org; Sat, 20 Aug 2011 10:42:50 -0400 Received: by eyg24 with SMTP id 24so3463243eyg.30 for ; Sat, 20 Aug 2011 07:42:49 -0700 (PDT) In-Reply-To: <4E4FC20F.7090101@gmail.com> 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: Andrea Crotti Cc: Brian Gough , Org Mode List On 20.8.2011, at 16:17, Andrea Crotti wrote: > On 08/18/2011 12:45 PM, Carsten Dominik wrote: >> Hi, >>=20 >> I was wondering if anyone here has the skills and interest to write >> a git merge driver for Org mode files, in the way >>=20 >> = http://git.savannah.gnu.org/gitweb/?p=3Dgnulib.git;a=3Dblob;f=3Dlib/git-me= rge-changelog.c >>=20 >> does this for GNU style ChangeLog files? >>=20 >> One of the obstacle for using Org-mode for collaborative programs is = that >> many operations add or remove text from the beginning or end of a = file, >> or which add or remove a subnode from an outline tree. >> These are operations that confuse the git merger, in particular >> if two people have added something to a file, or removed/added >> sequential sibling nodes. >>=20 >> I believe that this could be solved with a dedicated merge driver >> that understands the integrity of an outline (sub)tree, and that >> knows that the sequence of two new subtrees added by different people >> does not matter. >>=20 >> The idea for this is actually (I believe) from Brian Gough who asked = me >> about it at FOSDEM. I have now also run into this problem and would >> really find it great if such a merge driver could be written. >> Unfortunately, I do not have the skill for this. >>=20 >> - Carsten > Does the merge driver need to be written in C? I have no idea, but I would think that it could also be written in Perl, for example. > It looks quite a complex task considering that org-mode files > are not so easy to parse... >=20 > Anyway a partly unrelated thing, with git attributes I'm able > to see the diff of crypted org files very easily (maybe someone > is interested), adding to .git/config: >=20 > [diff "gpg"] > textconv =3D gpg2 --decrypt >=20 > and to .gitattributes: > *.gpg diff=3Dgpg interesting! - Carsten