emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Andrew Young <youngar17@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [GSoC] Org merge driver progress update
Date: Sat, 19 May 2012 17:33:58 -0400	[thread overview]
Message-ID: <CAMvvmF9YHEtJ8iVxvLOtyd8sT5VveUe3QKuMXXGxZei8XfnkpA@mail.gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

Hello everyone,

Just to remind everyone, my project is the  org merge driver.  The project
webpage is here<http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/index.html>,
and the code repository is
here<http://orgmode.org/w/?p=org-merge-driver.git;a=summary>.
 Here is a quick update on the problems I have encountered, and what is
going on:

I was on my way to finishing my prototype, but I felt that the prototype
was not going to really demonstrate any of the concepts and programming
techniques which I was going to use in the final version.  The prototype
was really just going to be bad merge driver.

I spent quite some time trying to implement a fast algorithm for finding
the shortest edit script of a file (this is what
'diff<http://en.wikipedia.org/wiki/Diff>'
does).  It turns out that the exact same
algorithm<http://www.grantjenks.com/wiki/_media/ideas:diffalgorithmlcs.pdf>
was
already implemented in Gnulib, which I am now using instead.

I am also trying to incorporate elements of polymorphism, generic
programming, and object oriented programming in C.  Its very interesting,
although it can get very complicated.  I am planning to use these concepts
to make the merge driver more extendable and reusable.

Right now I'm considering the implementation of the final merge driver, and
doing a lot of scratch work on paper.  The prototype should be finished
soon, and then I can move onto the real implementation.  In the code
repository, you can find a implementation notes in
doc/implementation.organd a log of what I'm working on in doc/
notes.org.

Sincerely,
Andrew Young

[-- Attachment #2: Type: text/html, Size: 1820 bytes --]

                 reply	other threads:[~2012-05-19 21:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=CAMvvmF9YHEtJ8iVxvLOtyd8sT5VveUe3QKuMXXGxZei8XfnkpA@mail.gmail.com \
    --to=youngar17@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /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

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).