From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Young Subject: [GSoC] Org merge driver progress update Date: Sat, 19 May 2012 17:33:58 -0400 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=0016e6dedd8c3eb58404c06a6da0 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:47657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SVrHn-0008T5-N4 for emacs-orgmode@gnu.org; Sat, 19 May 2012 17:34:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SVrHl-0000DQ-HD for emacs-orgmode@gnu.org; Sat, 19 May 2012 17:34:03 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:51751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SVrHl-0000D5-8o for emacs-orgmode@gnu.org; Sat, 19 May 2012 17:34:01 -0400 Received: by wefh52 with SMTP id h52so3221459wef.0 for ; Sat, 19 May 2012 14:33:58 -0700 (PDT) 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: emacs-orgmode@gnu.org --0016e6dedd8c3eb58404c06a6da0 Content-Type: text/plain; charset=ISO-8859-1 Hello everyone, Just to remind everyone, my project is the org merge driver. The project webpage is here, and the code repository is here. 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' does). It turns out that the exact same algorithm 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 --0016e6dedd8c3eb58404c06a6da0 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hello everyone,

Just to remind everyone, my project is the =A0org me= rge driver. =A0The project webpage is=A0here, = and the code=A0repository=A0is=A0here. =A0Here is a quick update on the pro= blems I have encountered, and what is going on:

I was on my way to finishing my prototype, but I felt that the prototyp= e was not going to really demonstrate any of the concepts and programming t= echniques which I was going to use in the final version. =A0The prototype w= as really just going to be bad merge driver.

I spent quite some time trying to implement a fast algorithm for findin= g the shortest edit script of a file (this is what 'diff' does). =A0It turns out that the=A0= exact same algorithm=A0was already implemented in Gnulib, which I am = now using instead.

I am also trying to incorporate elements of polymorphism, generic progr= amming, and object oriented programming in C. =A0Its very interesting, alth= ough it can get very complicated. =A0I am planning to use these concepts to= make the merge driver more extendable and=A0reusable.

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

Sincerely,
Andrew Young
--0016e6dedd8c3eb58404c06a6da0--