From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Young Subject: Re: [GSoC] org-merge-driver weekly update Date: Thu, 31 May 2012 03:31:28 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([208.118.235.92]:48033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZzr7-0004pT-MG for emacs-orgmode@gnu.org; Thu, 31 May 2012 03:31:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZzr1-0004Q3-36 for emacs-orgmode@gnu.org; Thu, 31 May 2012 03:31:37 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:49204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZzr0-0004OG-Na for emacs-orgmode@gnu.org; Thu, 31 May 2012 03:31:31 -0400 Received: by wibhm14 with SMTP id hm14so464420wib.12 for ; Thu, 31 May 2012 00:31:28 -0700 (PDT) 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: Carsten Dominik Cc: emacs-orgmode@gnu.org Hi Carsten, On Wed, May 30, 2012 at 1:15 PM, Carsten Dominik wrote: > > Hi Andrew, > > On 30.5.2012, at 16:36, Andrew Young wrote: > > > Hello everyone, > > > > I would just like to let everyone know that a prototype for org-merge-d= river is available. =A0It is not complete, so of course please do not use i= t for your repository! ;) > > > > You can see some example use of it at the the worg project page: http:/= /orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/prot= otype.html > > > A nice start! > > In your first example, it seems incorrect to me that "* A new heading in = file 2" > ends up being the first top-level headline in the merged file. =A0It is a= dded as > second in file two, so I clearly would expect it to appear as second in t= he merged file. > > Greetings > > - Carsten > > P.S. =A0Bastien, should comments and discussions like this one be on the = list, or off list? > > - Carsten I agree that the prototype is not correct in this respect. I originally planned to separate orgmode elements into two types: ordered and unordered. Unordered elements would be things like plain lists and headings. Ordered entities would be things like numbered plain lists. This decision led to the prototype not tracking the order which headings appear. Only hierachical position was tracked and used in the prototype. As a result, new headings are always shown at the start of a level, and reordered headings may or may show up in the new order. I have since changed my mind about how to handle this situation. The new strategy is to track the same positional data for both ordered and unordered elements. The difference between the element types will be in how reorders from both files will be merged together. I can modify the prototype to print headings in the correct order, but I'm mostly just interested in moving on. Sincerely, Andrew