From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Thum <simon.thum@gmx.de>
Subject: Re: [GSoC] Org Merge Driver Update
Date: Sat, 18 Aug 2012 04:09:03 +0200
Message-ID: <502EF93F.4080005@gmx.de>
References: <CAMvvmF-1y74Fr=JYyA8+UE7qy4gnpn6w5rB5WKbzQkiqGkz9Gw@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 8bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:51765)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon.thum@gmx.de>) id 1T2YV4-0002Bh-DA
	for emacs-orgmode@gnu.org; Fri, 17 Aug 2012 22:10:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon.thum@gmx.de>) id 1T2YTi-0001ex-2R
	for emacs-orgmode@gnu.org; Fri, 17 Aug 2012 22:09:31 -0400
Received: from mailout-de.gmx.net ([213.165.64.22]:46126)
	by eggs.gnu.org with smtp (Exim 4.71)
	(envelope-from <simon.thum@gmx.de>) id 1T2YTh-0001er-PJ
	for emacs-orgmode@gnu.org; Fri, 17 Aug 2012 22:09:30 -0400
In-Reply-To: <CAMvvmF-1y74Fr=JYyA8+UE7qy4gnpn6w5rB5WKbzQkiqGkz9Gw@mail.gmail.com>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Andrew Young <youngar17@gmail.com>
Cc: "emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>

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