From: Carsten Dominik <carsten.dominik@gmail.com>
To: Andrew Young <youngar17@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [GSoC] org-merge-driver weekly update
Date: Thu, 31 May 2012 09:38:46 +0200 [thread overview]
Message-ID: <A1472724-BB11-4F36-9395-951F2775DF4C@gmail.com> (raw)
In-Reply-To: <CAMvvmF9Qi5F145+Z3ABQfoL+zvnPjuv7CDNMmFKKJbLn7Lu6iw@mail.gmail.com>
Hi Andrew,
On 31.5.2012, at 09:31, Andrew Young wrote:
> Hi Carsten,
>
> On Wed, May 30, 2012 at 1:15 PM, Carsten Dominik
> <carsten.dominik@gmail.com> 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-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
>>
>>
>> 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
>
> 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.
OK, this sounds right.
>
> 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
next prev parent reply other threads:[~2012-05-31 7:38 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 [this message]
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
-- 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=A1472724-BB11-4F36-9395-951F2775DF4C@gmail.com \
--to=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).