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