From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Young Subject: Re: [GSoC] Org Merge Driver Update Date: Thu, 16 Aug 2012 06:27:07 -0400 Message-ID: References: <87ipckaxy8.fsf@gmx.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:50929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1xIE-0008A0-CH for emacs-orgmode@gnu.org; Thu, 16 Aug 2012 06:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1xID-0000sI-1W for emacs-orgmode@gnu.org; Thu, 16 Aug 2012 06:27:10 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:48939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1xIC-0000sA-PX for emacs-orgmode@gnu.org; Thu, 16 Aug 2012 06:27:08 -0400 Received: by weys10 with SMTP id s10so1870856wey.0 for ; Thu, 16 Aug 2012 03:27:07 -0700 (PDT) In-Reply-To: <87ipckaxy8.fsf@gmx.com> 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: Eric Schulte Cc: "emacs-orgmode@gnu.org" Hi, On Wed, Aug 15, 2012 at 1:04 PM, Eric Schulte wrote: > I'm very excited to start using this merge driver. I've put together an > Arch Linux User Repository (aur) package, which can be used by Arch > Linux users to install the org-merge-driver with pacman. It is > available at [1], Thank you so much for doing this! I'm also an Arch Linux user, and am now using your package as well! > if others find it useful and if Andrew doesn't object > I'd be happy to push it into the official aur database. It is very > simple and installs directly from git. > Yes, of course I don't mind. This would be _awesome_. I just installed OMD through your package. Pretty exciting for me! It took me a little bit to realize the linked file was not corrupted ;), but HTML to the new package. Regarding the gnulib dependency: I have included the Gnulib sources which my project depends on directly into the git repository. Because of this, gnulib shouldn't be nessecary to build. I've done this for two main reasons: 1. I thought that would make the dependencies easier on everyone else to build and install. 2. I believe I've uncovered a bug in one of the sources I'm using, and so for the time being I'm using a slightly edited version. I'm really not sure what the standard is for using GnuLib in a project. I think that distributing Gnulib dependencies directly with a project may be typical, given that it is used at the source level. (If anyone has any opinion on this, please share) For the time being, it may be best to leave Gnulib out as dependency, until I find out what to do. Re-importing Gnulib modules may reintroduce the problem I was having. > I spent some time testing this locally and I've run into what appears to > be an error. Namely when merging a tree with multiple new sub-headings > the merge completes successfully, but the subheadings from the OTHER > branch are deleted by the merge. Here [2] is a tarball of the entire > git directory after the failed merge. Please let me know if there is > any other debug information I can provide. > Thank you for letting me know, and your detailed example. This should be fixed now, along with some other issues. > Thanks, > > Footnotes: > [1] http://cs.unm.edu/~eschulte/data/org-merge-driver-20120815-1.src.tar.gz > > [2] http://cs.unm.edu/~eschulte/data/fruit-test.tar.bz2 > > -- > Eric Schulte > http://cs.unm.edu/~eschulte Thanks again for doing all this, it's really appreciated! Sincerely, Andrew Young