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: Wed, 06 Jun 2012 10:20:39 -0400 [thread overview]
Message-ID: <m3y5o0plmw.fsf@quad.robs.office> (raw)
In-Reply-To: <87C9FA23-FD18-4BEF-9644-5BEBA3650F41@gmail.com>
Carsten Dominik <carsten.dominik@gmail.com> 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
next prev parent reply other threads:[~2012-06-06 14:20 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
2012-06-06 13:50 ` Andrew Young
2012-06-06 13:56 ` Carsten Dominik
2012-06-06 14:20 ` Robert Horn [this message]
-- 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=m3y5o0plmw.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).