Re: [O] [GSoC] Org Merge Driver Update

[Simon Thum]

Hi Andrew,

sorry to report less exciting things. I could not compile - the repo 
contains two invalid links into my system:

lrwxrwxrwx 1 simon users    38 Aug 18 04:01 tap-driver.sh -> 
/usr/share/automake-1.12/tap-driver.sh
lrwxrwxrwx 1 simon users    36 Aug 18 04:01 test-driver -> 
/usr/share/automake-1.12/test-driver

I'm on gentoo and do not have automake 1.12. Using a link not the right 
thing IMO.

II removed those from being referenced in source files and came farther, 
only for gcc to balk on

doc_ref.h:54:3: error: redefinition of typedef ‘doc_ref’
doc_ref.h:31:24: note: previous declaration of ‘doc_ref’ was here
doc_ref.h: In function ‘doc_ref_check_for_circular_conflict’:

and other such occurrences.

I'm not sure about the cause, but maybe typedefs conflict with struct names?

HTH,

Simon

On 08/14/2012 01:15 AM, Andrew Young wrote:
> Hello Everyone,
>
> I've been working on a merge driver for org-mode documents over the
> summer as a Google Summer of Code project. I just wanted to show
> everyone some progress on the merge driver.
>
> There are some new examples you can see at the project page [1][2], and
> instructions on how to build and use it.
>
> the source is available here: git clone git://orgmode.org/org-merge-driver.git
>
> I'd really appreciate if anyone could take the merge driver out for a
> test spin, and come back with any kind of feedback, such as:
>
> - file output
> - customization
> - the user interface
> - the merging rules
> - new features and element specific support
> - testing
> - neat ideas, etc.
>
> There is only about a week left in GSoC, but I'm planning to continue to
> develop the merge driver past the end of GSoC.
>
> Please take a look, and thanks,
>
> Andrew Young
>
> [1] project page:
> http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/
> [2] examples:
> http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/examples.html