From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [GSoC] org-merge-driver weekly update Date: Thu, 31 May 2012 09:38:46 +0200 Message-ID: References: Mime-Version: 1.0 (Apple Message framework v1278) Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([208.118.235.92]:57519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZzxn-0006Rr-Tv for emacs-orgmode@gnu.org; Thu, 31 May 2012 03:38:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZzxh-0006Jr-MF for emacs-orgmode@gnu.org; Thu, 31 May 2012 03:38:31 -0400 Received: from mail-ey0-f169.google.com ([209.85.215.169]:60106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZzxh-0006Jd-Dg for emacs-orgmode@gnu.org; Thu, 31 May 2012 03:38:25 -0400 Received: by eaan1 with SMTP id n1so191035eaa.0 for ; Thu, 31 May 2012 00:38:23 -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: Andrew Young Cc: emacs-orgmode@gnu.org Hi Andrew, On 31.5.2012, at 09:31, Andrew Young wrote: > Hi Carsten, >=20 > On Wed, May 30, 2012 at 1:15 PM, Carsten Dominik > wrote: >>=20 >> Hi Andrew, >>=20 >> On 30.5.2012, at 16:36, Andrew Young wrote: >>=20 >>> Hello everyone, >>>=20 >>> I would just like to let everyone know that a prototype for = org-merge-driver is available. It is not complete, so of course please = do not use it for your repository! ;) >>>=20 >>> 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-to= ol/prototype.html >>=20 >>=20 >> A nice start! >>=20 >> 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. It is = added as >> second in file two, so I clearly would expect it to appear as second = in the merged file. >>=20 >> Greetings >>=20 >> - Carsten >>=20 >> P.S. Bastien, should comments and discussions like this one be on = the list, or off list? >>=20 >> - Carsten >=20 > 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. >=20 > 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. >=20 > 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. OK, this sounds right. >=20 > I can modify the prototype to print headings in the correct > order, but I'm mostly just interested in moving on. I see no compelling reason to update the prototype - just wanted to give = feedback. - Carsten