From: Eric Schulte <eric.schulte@gmx.com>
To: Andrew Young <youngar17@gmail.com>
Cc: "emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>
Subject: Re: [GSoC] Org Merge Driver Update
Date: Thu, 16 Aug 2012 08:34:57 -0600 [thread overview]
Message-ID: <874no2hpm6.fsf@gmx.com> (raw)
In-Reply-To: <CAMvvmF_GDjsf7kYqxVC8YEpL24JNjb=ta7exBEwS5M+=xR-SjA@mail.gmail.com> (Andrew Young's message of "Thu, 16 Aug 2012 06:27:07 -0400")
Andrew Young <youngar17@gmail.com> writes:
> Hi,
> On Wed, Aug 15, 2012 at 1:04 PM, Eric Schulte <eric.schulte@gmx.com> 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)
>
I don't know about this personally, but from the gnulib site [1], this
sounds like the intended method of use.
>
> 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'll remove 'gnulib' from the dependencies and remove the libtool
portion of the build sequence.
>
>> 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.
>
Yes, I can confirm that this now works for me.
>
>> 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!
>
My pleasure, I've now submitted this package to the AUR database [2].
Cheers,
>
> Sincerely,
> Andrew Young
>
Footnotes:
[1] http://www.gnu.org/software/gnulib/ (end of third paragraph)
[2] https://aur.archlinux.org/packages.php?ID=62052
--
Eric Schulte
http://cs.unm.edu/~eschulte
next prev parent reply other threads:[~2012-08-16 15:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-13 23:15 [GSoC] Org Merge Driver Update Andrew Young
2012-08-15 17:04 ` Eric Schulte
2012-08-15 19:22 ` Bastien
2012-08-15 20:15 ` Rasmus
2012-08-16 10:27 ` Andrew Young
2012-08-16 14:34 ` Eric Schulte [this message]
2012-08-18 2:09 ` Simon Thum
2012-08-18 8:24 ` Andrew Young
2012-08-26 0:23 ` Simon Thum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874no2hpm6.fsf@gmx.com \
--to=eric.schulte@gmx.com \
--cc=emacs-orgmode@gnu.org \
--cc=youngar17@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).