From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Young Subject: [GSoC] org-merge-driver weekly update Date: Wed, 30 May 2012 10:36:38 -0400 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=0016e6d99a9202327f04c141e109 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:35169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZk10-0006N7-Sd for emacs-orgmode@gnu.org; Wed, 30 May 2012 10:36:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZk0v-0001yR-VU for emacs-orgmode@gnu.org; Wed, 30 May 2012 10:36:46 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:55394) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZk0v-0001tj-Mp for emacs-orgmode@gnu.org; Wed, 30 May 2012 10:36:41 -0400 Received: by wefh52 with SMTP id h52so4339518wef.0 for ; Wed, 30 May 2012 07:36:39 -0700 (PDT) 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 --0016e6d99a9202327f04c141e109 Content-Type: text/plain; charset=ISO-8859-1 Hello everyone, 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! ;) 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/prototype.html Sincerely, Andrew Young --0016e6d99a9202327f04c141e109 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Hello everyone,

I would just like to let ever= yone know that a prototype for org-merge-driver is available. =A0It is not = complete, so of course please do not use it for your repository! ;)

You can see some example use of it at the the worg project p= age:=A0http://orgmode.org/worg/org-contrib/gso= c2012/student-projects/git-merge-tool/prototype.html

Sincerely,
Andrew Young
--0016e6d99a9202327f04c141e109-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [GSoC] org-merge-driver weekly update Date: Wed, 30 May 2012 19:15:30 +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]:55477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZmUM-0005Yf-67 for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:15:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZmUK-0002yh-Cy for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:15:13 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:41708) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZmUK-0002xu-4G for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:15:12 -0400 Received: by wefh52 with SMTP id h52so40092wef.0 for ; Wed, 30 May 2012 10:15:09 -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 30.5.2012, at 16:36, Andrew Young wrote: > 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 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. It is = added as second in file two, so I clearly would expect it to appear as second in = the merged file. Greetings - Carsten P.S. Bastien, should comments and discussions like this one be on the = list, or off list? - Carsten= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: [GSoC] org-merge-driver weekly update Date: Wed, 30 May 2012 19:56:06 +0200 Message-ID: <87y5o9pn7t.fsf@gnu.org> References: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:52135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZn77-0001Xh-PY for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:55:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZn73-0007Fy-3g for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:55:17 -0400 Received: from incoming2.cnam.fr ([163.173.128.34]:57161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZn72-0007FS-U0 for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:55:13 -0400 In-Reply-To: (Carsten Dominik's message of "Wed, 30 May 2012 19:15:30 +0200") 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: Andrew Young , emacs-orgmode@gnu.org Hi Carsten, Carsten Dominik writes: > P.S. Bastien, should comments and discussions like this one be on the > list, or off list? I think it's fine to comment and discuss publicly available work on this list. Involving the community is part of the GSoC "rules". Thanks, -- Bastien 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 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Horn Subject: Re: [GSoC] org-merge-driver weekly update Date: Mon, 04 Jun 2012 11:30:52 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([208.118.235.92]:36917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbZmd-0000ye-1n for emacs-orgmode@gnu.org; Mon, 04 Jun 2012 12:05:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbZmY-0006uB-18 for emacs-orgmode@gnu.org; Mon, 04 Jun 2012 12:05:30 -0400 Received: from l2mail1.panix.com ([166.84.1.75]:56755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbZmX-0006u1-TH for emacs-orgmode@gnu.org; Mon, 04 Jun 2012 12:05:25 -0400 Received: from mailbackend.panix.com (mailbackend.panix.com [166.84.1.89]) by l2mail1.panix.com (Postfix) with ESMTP id AA67ADD for ; Mon, 4 Jun 2012 11:30:55 -0400 (EDT) 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 , Andrew Young Cc: emacs-orgmode@gnu.org Another area that would be nice to address is taking advantage of the information in date-trees so assist with merging. This is similar to the logic around keeping headlines in order. With date trees there is a date and sometimes time tag to help. In addition to the occurrence order, there is also an ordering constraint on date trees that can be used to determine the proper delta. You can use the date and time information in the headlines to determine the proper sequencing. For example, the delta/merger for two files of the form: File 1: * Year ** Year-Month *** Year-Month-Day **** Y-M-D-Time1 stuff1 ... **** Y-M-D-Time2 stuff2 ... **** Y-M-D-Time4 stuff4 ... **** Y-M-D-Time5 stuff5 ... **** Y-M-D-Time9 stuff9 ... File 2: * Year ** Year-Month *** Year-Month-Day **** Y-M-D-Time1 stuff1 ... **** Y-M-D-Time2 stuff2 ... **** Y-M-D-Time3 stuff3 ... **** Y-M-D-Time6 stuff6 ... **** Y-M-D-Time7 stuff7 ... Should be: * Year ** Year-Month *** Year-Month-Day **** Y-M-D-Time1 stuff1 ... **** Y-M-D-Time2 stuff2 ... **** Y-M-D-Time3 stuff3 ... **** Y-M-D-Time4 stuff4 ... **** Y-M-D-Time5 stuff5 ... **** Y-M-D-Time6 stuff6 ... **** Y-M-D-Time7 stuff7 ... **** Y-M-D-Time9 stuff9 ... This time aware merge logic will apply similarly to all levels of the date tree. Date trees are recognizable by the combination of headlines in this format. A date tree can occur anywhere in an org file, but it will begin with a level one headline of the form "* YYYY", etc. R Horn rjhorn@alum.mit.edu From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Young Subject: Re: [GSoC] org-merge-driver weekly update Date: Wed, 6 Jun 2012 09:50:13 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:48550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScGcs-0006eC-7J for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 09:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScGcq-0003WY-9C for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 09:50:17 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:37257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScGcq-0003W4-0L for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 09:50:16 -0400 Received: by wibhn14 with SMTP id hn14so101090wib.0 for ; Wed, 06 Jun 2012 06:50:13 -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 Cc: emacs-orgmode@gnu.org, Carsten Dominik Hi Robert Horn, On Mon, Jun 4, 2012 at 11:30 AM, Robert Horn wrote: > Another area that would be nice to address is taking advantage of the > information in date-trees so assist with merging. This is similar to > the logic around keeping headlines in order. With date trees there is a > date and sometimes time tag to help. > > In addition to the occurrence order, there is also an ordering constraint on date trees that can be used to determine the proper delta. You can use the date and time information in the headlines to determine the proper sequencing. > > For example, the delta/merger for two files of the form: > File 1: > * Year > ** Year-Month > *** Year-Month-Day > **** Y-M-D-Time1 stuff1 ... > **** Y-M-D-Time2 stuff2 ... > **** Y-M-D-Time4 stuff4 ... > **** Y-M-D-Time5 stuff5 ... > **** Y-M-D-Time9 stuff9 ... > File 2: > * Year > ** Year-Month > *** Year-Month-Day > **** Y-M-D-Time1 stuff1 ... > **** Y-M-D-Time2 stuff2 ... > **** Y-M-D-Time3 stuff3 ... > **** Y-M-D-Time6 stuff6 ... > **** Y-M-D-Time7 stuff7 ... > > Should be: > * Year > ** Year-Month > *** Year-Month-Day > **** Y-M-D-Time1 stuff1 ... > **** Y-M-D-Time2 stuff2 ... > **** Y-M-D-Time3 stuff3 ... > **** Y-M-D-Time4 stuff4 ... > **** Y-M-D-Time5 stuff5 ... > **** Y-M-D-Time6 stuff6 ... > **** Y-M-D-Time7 stuff7 ... > **** Y-M-D-Time9 stuff9 ... > > This time aware merge logic will apply similarly to all levels of the date tree. > > Date trees are recognizable by the combination of headlines in this > format. A date tree can occur anywhere in an org file, but it will > begin with a level one headline of the form "* YYYY", etc. > > R Horn > rjhorn@alum.mit.edu Thank you for the suggestion! The program should support date trees. I wonder if date trees specifically should be aggressively resorted during the merge (reordering more headings than necessary, without regards to the in-file ordering). It is currently my opinion that the program should try to retain the original ordering as much as possible, only sorting the minimum number of headings necessary when merging has made the ordering ambiguous. Sincerely, Andrew Young From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [GSoC] org-merge-driver weekly update Date: Wed, 6 Jun 2012 15:56:08 +0200 Message-ID: <87C9FA23-FD18-4BEF-9644-5BEBA3650F41@gmail.com> 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]:59910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScGik-00009d-OK for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 09:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScGid-00059S-HS for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 09:56:22 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:55965) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScGid-00056U-8L for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 09:56:15 -0400 Received: by wefh52 with SMTP id h52so5471594wef.0 for ; Wed, 06 Jun 2012 06:56:11 -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 On 6.6.2012, at 15:50, Andrew Young wrote: > Hi Robert Horn, >=20 > On Mon, Jun 4, 2012 at 11:30 AM, Robert Horn = wrote: >> Another area that would be nice to address is taking advantage of the >> information in date-trees so assist with merging. This is similar to >> the logic around keeping headlines in order. With date trees there = is a >> date and sometimes time tag to help. >>=20 >> In addition to the occurrence order, there is also an ordering = constraint on date trees that can be used to determine the proper delta. = You can use the date and time information in the headlines to determine = the proper sequencing. >>=20 >> For example, the delta/merger for two files of the form: >> File 1: >> * Year >> ** Year-Month >> *** Year-Month-Day >> **** Y-M-D-Time1 stuff1 ... >> **** Y-M-D-Time2 stuff2 ... >> **** Y-M-D-Time4 stuff4 ... >> **** Y-M-D-Time5 stuff5 ... >> **** Y-M-D-Time9 stuff9 ... >> File 2: >> * Year >> ** Year-Month >> *** Year-Month-Day >> **** Y-M-D-Time1 stuff1 ... >> **** Y-M-D-Time2 stuff2 ... >> **** Y-M-D-Time3 stuff3 ... >> **** Y-M-D-Time6 stuff6 ... >> **** Y-M-D-Time7 stuff7 ... >>=20 >> Should be: >> * Year >> ** Year-Month >> *** Year-Month-Day >> **** Y-M-D-Time1 stuff1 ... >> **** Y-M-D-Time2 stuff2 ... >> **** Y-M-D-Time3 stuff3 ... >> **** Y-M-D-Time4 stuff4 ... >> **** Y-M-D-Time5 stuff5 ... >> **** Y-M-D-Time6 stuff6 ... >> **** Y-M-D-Time7 stuff7 ... >> **** Y-M-D-Time9 stuff9 ... >>=20 >> This time aware merge logic will apply similarly to all levels of the = date tree. >>=20 >> Date trees are recognizable by the combination of headlines in this >> format. A date tree can occur anywhere in an org file, but it will >> begin with a level one headline of the form "* YYYY", etc. >>=20 >> R Horn >> rjhorn@alum.mit.edu >=20 > Thank you for the suggestion! The program should support date trees. >=20 > I wonder if date trees specifically should be aggressively resorted > during the merge (reordering more headings than necessary, without > regards to the in-file ordering). It is currently my opinion that the > program should try to retain the original ordering as much as > possible, only sorting the minimum number of headings necessary when > merging has made the ordering ambiguous. As a general remark, if you implement things like aggressive resorting, I think it would be good to have such features optional, in some way configurable. Turning off all bells would then do a simple stable outline tree inserting like you have in your prototype. Increasing complexity can and should be implemented, but I would like them optional for users (opt-out is OK). Greetings - Carsten >=20 > Sincerely, > Andrew Young From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Horn Subject: Re: [GSoC] org-merge-driver weekly update Date: Wed, 06 Jun 2012 10:20:39 -0400 Message-ID: References: <87C9FA23-FD18-4BEF-9644-5BEBA3650F41@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([208.118.235.92]:56820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScH6S-0006RX-PF for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 10:20:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScH6I-0002x0-Sf for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 10:20:52 -0400 Received: from mailbackend.panix.com ([166.84.1.89]:50164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScH6I-0002wm-Kg for emacs-orgmode@gnu.org; Wed, 06 Jun 2012 10:20:42 -0400 In-Reply-To: <87C9FA23-FD18-4BEF-9644-5BEBA3650F41@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: Carsten Dominik , Andrew Young Cc: emacs-orgmode@gnu.org Carsten Dominik writes: > On 6.6.2012, at 15:50, Andrew Young wrote: > As a general remark, if you implement things like aggressive resorting, > I think it would be good to have such features optional, in some > way configurable. Turning off all bells would then do a simple stable > outline tree inserting like you have in your prototype. Increasing > complexity can and should be implemented, but I would like them optional > for users (opt-out is OK). > I agree. I'm thinking about a problem that I routinely have. I work on multiple computers capturing notes into journals that are date-trees. I resynchronize these journals using git, and git is often confused about what to do when it sees the same base tree with different additions from the different computers. In my usage there are never deletes, and I would expect that the order of headlines in the original versions would be preserved as the order of those headlines in the merged version. I don't get out of order headlines because the capture function manages the date tree for me. If I had an improperly ordered input I would prefer to have the merger fail and ask for manual help. If it's out of order that means either something went wrong with the capture function, or I manually did something that I might want preserved. For instance, I might archive the 2010 notes into some other file, and replace them with a link to that file. I would want to preserve this. (Actually the issue of how to manage such archival is one that I haven't given much thought, since disk space is cheap and it's easy to collapse the old stuff.) Robert Horn From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Young Subject: [GSoC] org-merge-driver weekly update Date: Sat, 16 Jun 2012 22:15:34 -0400 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:52338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sg51f-0004xP-F3 for emacs-orgmode@gnu.org; Sat, 16 Jun 2012 22:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sg51d-00014i-Uc for emacs-orgmode@gnu.org; Sat, 16 Jun 2012 22:15:39 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:62722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sg51d-00014Y-M0 for emacs-orgmode@gnu.org; Sat, 16 Jun 2012 22:15:37 -0400 Received: by wefh52 with SMTP id h52so3734830wef.0 for ; Sat, 16 Jun 2012 19:15:35 -0700 (PDT) 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 Hi everyone, small weekly update; I'm almost finished creating the parser. Because of the nature of org mode grammar, the files are being parsed with regexs and (f)lex. Because Orgmode files can be written in any character encoding supported in Emacs, I am looking into using libiconv to support as many file encodings as possible. Sincerely, Andrew Young