From: Robert Horn <rjhorn@alum.mit.edu>
To: Carsten Dominik <carsten.dominik@gmail.com>,
Andrew Young <youngar17@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [GSoC] org-merge-driver weekly update
Date: Mon, 04 Jun 2012 11:30:52 -0400 [thread overview]
Message-ID: <m3vcj7m6vn.fsf@quad.robs.office> (raw)
In-Reply-To: <A1472724-BB11-4F36-9395-951F2775DF4C@gmail.com>
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
next prev parent reply other threads:[~2012-06-04 16:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-30 14:36 [GSoC] org-merge-driver weekly update Andrew Young
2012-05-30 17:15 ` Carsten Dominik
2012-05-30 17:56 ` Bastien
2012-05-31 7:31 ` Andrew Young
2012-05-31 7:38 ` Carsten Dominik
2012-06-04 15:30 ` Robert Horn [this message]
2012-06-06 13:50 ` Andrew Young
2012-06-06 13:56 ` Carsten Dominik
2012-06-06 14:20 ` Robert Horn
-- strict thread matches above, loose matches on Subject: below --
2012-06-17 2:15 Andrew Young
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3vcj7m6vn.fsf@quad.robs.office \
--to=rjhorn@alum.mit.edu \
--cc=carsten.dominik@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=youngar17@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).