org-merge-driver.git
22 months agoDetect conflict when moving and removing an element prototype
Andrew Young [Fri, 1 Jun 2012 04:03:14 +0000]
Detect conflict when moving and removing an element

22 months agoFix parser from removing the last character in a file
Andrew Young [Wed, 30 May 2012 11:18:34 +0000]
Fix parser from removing the last character in a file

22 months agoStop ancestor headings being matched to headings with an ID
Andrew Young [Wed, 30 May 2012 08:43:05 +0000]
Stop ancestor headings being matched to headings with an ID

22 months agoMap headings based off of the heading ID if there is one
Andrew Young [Wed, 30 May 2012 08:35:15 +0000]
Map headings based off of the heading ID if there is one

22 months agoParse :ID: property from a heading property list
Andrew Young [Wed, 30 May 2012 08:26:57 +0000]
Parse :ID: property from a heading property list

22 months agoStop headings from being printed in reverse order
Andrew Young [Wed, 30 May 2012 05:50:16 +0000]
Stop headings from being printed in reverse order

22 months agoProperly merge content updates for different change types
Andrew Young [Wed, 30 May 2012 05:28:25 +0000]
Properly merge content updates for different change types

22 months agoPrint output to files
Andrew Young [Wed, 30 May 2012 04:05:17 +0000]
Print output to files

22 months agoFix recursive different parent matching
Andrew Young [Tue, 29 May 2012 01:04:09 +0000]
Fix recursive different parent matching

22 months agoMatch children headings of unmatched headings
Andrew Young [Mon, 28 May 2012 08:25:01 +0000]
Match children headings of unmatched headings

22 months agoFix merger change detection and implement recursive heuristics for change detection
Andrew Young [Mon, 28 May 2012 04:47:50 +0000]
Fix merger change detection and implement recursive heuristics for change detection

22 months agoAdd initial merging algorithm
Andrew Young [Sat, 26 May 2012 15:18:37 +0000]
Add initial merging algorithm

22 months agoAdd some practice org docuements to tests
Andrew Young [Fri, 25 May 2012 05:59:14 +0000]
Add some practice org docuements to tests

22 months agoImplement first draft of the 'matching' algorithm
Andrew Young [Fri, 25 May 2012 05:58:15 +0000]
Implement first draft of the 'matching' algorithm

22 months agoUpdate implementation and TODO notes
Andrew Young [Fri, 25 May 2012 05:57:34 +0000]
Update implementation and TODO notes

23 months agoUpdate todo and log
Andrew Young [Thu, 17 May 2012 02:30:30 +0000]
Update todo and log

23 months agoUse diffseq to find differences between headings of the same 'level'
Andrew Young [Thu, 17 May 2012 02:29:59 +0000]
Use diffseq to find differences between headings of the same 'level'

23 months agoDetect changes neccessary to change one orgmode file into another
Andrew Young [Thu, 17 May 2012 02:27:22 +0000]
Detect changes neccessary to change one orgmode file into another

23 months agoImport gnulib diffseq
Andrew Young [Wed, 16 May 2012 21:31:36 +0000]
Import gnulib diffseq

23 months agoUpdate implementation notes, todo list and diary
Andrew Young [Wed, 16 May 2012 21:30:38 +0000]
Update implementation notes, todo list and diary

23 months agoUpdate diary and remove use instructions from implementation
Andrew Young [Wed, 16 May 2012 07:03:53 +0000]
Update diary and remove use instructions from implementation

23 months agoUpdate implementation and todo notes
Andrew Young [Tue, 15 May 2012 15:44:24 +0000]
Update implementation and todo notes

23 months agoFix gl_list missing inline functions and reverse gl_list hack
Andrew Young [Thu, 10 May 2012 21:31:15 +0000]
Fix gl_list missing inline functions and reverse gl_list hack

23 months agoCleanup source code
Andrew Young [Thu, 10 May 2012 21:22:59 +0000]
Cleanup source code

23 months agoFix bugs in the parser and tree operating functions
Andrew Young [Thu, 10 May 2012 17:08:58 +0000]
Fix bugs in the parser and tree operating functions

23 months agoFinish parser
Andrew Young [Thu, 10 May 2012 11:28:14 +0000]
Finish parser

23 months agoAdd function to print to a stream
Andrew Young [Thu, 10 May 2012 08:43:25 +0000]
Add function to print to a stream

23 months agoUpdate todo.org
Andrew Young [Thu, 10 May 2012 03:30:57 +0000]
Update todo.org

23 months agoAdd function to write org documents back to their source files
Andrew Young [Thu, 10 May 2012 03:30:10 +0000]
Add function to write org documents back to their source files

23 months agoUpdate todo list and implementation notes
Andrew Young [Wed, 9 May 2012 05:50:57 +0000]
Update todo list and implementation notes

23 months agoIgnore automake and build targets in Git
Andrew Young [Wed, 9 May 2012 05:33:03 +0000]
Ignore automake and build targets in Git

23 months agoCleanup autotool files
Andrew Young [Wed, 9 May 2012 04:24:57 +0000]
Cleanup autotool files

23 months agoRename test directory
Andrew Young [Wed, 9 May 2012 02:02:21 +0000]
Rename test directory

23 months agoFix spelling mistake in README
Andrew Young [Wed, 9 May 2012 01:58:15 +0000]
Fix spelling mistake in README

23 months agoAdd test directory
Andrew Young [Wed, 9 May 2012 01:15:44 +0000]
Add test directory

23 months agoAdd documentation directory
Andrew Young [Wed, 9 May 2012 01:09:56 +0000]
Add documentation directory

23 months agoAdd basic usage and compilation instructions to README
Andrew Young [Tue, 8 May 2012 21:07:37 +0000]
Add basic usage and compilation instructions to README

23 months agoUse Gnu project standards
Andrew Young [Tue, 8 May 2012 17:11:14 +0000]
Use Gnu project standards

23 months agoIgnore *.o and *.a files in Git
Andrew Young [Tue, 8 May 2012 16:07:11 +0000]
Ignore *.o and *.a files in Git

23 months agoHack gl_list to work by removing inline functions
Andrew Young [Tue, 8 May 2012 15:48:43 +0000]
Hack gl_list to work by removing inline functions

23 months agoFix source file name
Andrew Young [Tue, 8 May 2012 15:39:55 +0000]
Fix source file name

23 months agoAdd partial parser implementation
Andrew Young [Tue, 8 May 2012 15:12:43 +0000]
Add partial parser implementation

23 months agoAdd main program body
Andrew Young [Tue, 8 May 2012 15:12:06 +0000]
Add main program body

23 months agoAdd org_document type
Andrew Young [Tue, 8 May 2012 15:09:37 +0000]
Add org_document type

23 months agoAdd functions for reading files
Andrew Young [Tue, 8 May 2012 14:39:43 +0000]
Add functions for reading files

23 months agoRecurse automake into src directory
Andrew Young [Tue, 8 May 2012 14:38:47 +0000]
Recurse automake into src directory

23 months agoAdd src directory
Andrew Young [Tue, 8 May 2012 14:09:44 +0000]
Add src directory

23 months agoImport gnulib array-list
Andrew Young [Tue, 8 May 2012 13:58:17 +0000]
Import gnulib array-list

23 months agoREADME: Add project description and webpage
Andrew Young [Tue, 8 May 2012 05:10:58 +0000]
README: Add project description and webpage

* README: Add project description and webpage

23 months agoAdd basic Gnu standard project layout
Andrew Young [Fri, 4 May 2012 05:02:03 +0000]
Add basic Gnu standard project layout