From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jambunathan K Subject: Re: Participating in Google Summer of Code 2012 Date: Fri, 02 Mar 2012 22:42:06 +0530 Message-ID: <81sjhrx6zd.fsf@gmail.com> References: <877gz31kbo.fsf@gnu.org> <81wr73x803.fsf@gmail.com> <87y5rjlz69.fsf@gmx.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:56004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3W1m-0000JB-TB for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 12:12:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S3W1g-0006yc-8p for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 12:12:22 -0500 Received: from mail-pw0-f41.google.com ([209.85.160.41]:44100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3W1f-0006yV-T5 for emacs-orgmode@gnu.org; Fri, 02 Mar 2012 12:12:16 -0500 Received: by pbbro12 with SMTP id ro12so2460019pbb.0 for ; Fri, 02 Mar 2012 09:12:13 -0800 (PST) In-Reply-To: <87y5rjlz69.fsf@gmx.com> (Eric Schulte's message of "Fri, 02 Mar 2012 09:56:14 -0700") 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: emacs-orgmode@gnu.org Eric Schulte writes: > Jambunathan K writes: > >> "Git merge tool for Org files" >> >> http://lists.gnu.org/archive/html/emacs-orgmode/2011-08/msg00601.html >> > > Interesting, along these lines, I know git is able to use custom diffs > (e.g., there exist sentence rather than line-based diffs for writing > prose). I wonder if an outline diff would be useful, so that > re-ordering subtrees in an Org-mode file was represented as a single > operation rather than many un-related deletions and insertions. Caveat: I know practically nothing - technically - about the project being discussed. I am commenting here as a lay user. Sometime back while looking at change tracking within OpenDocument files, I stumbled upon the following two entries. http://wiki.documentfoundation.org/Track_changes#Google_Summer_of_Code_2009:_Improve_Writer.27s_compare_function http://gsoc-tzvetelina.blogspot.in/ In the above blog, the author is talking about paragraphs as a unit and makes a note of the algorithms he uses to narrow down the paragraphs of interest. I think in Org's context, outline could (also) be considered as a unit.