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: Wed, 15 Aug 2012 11:04:31 -0600 [thread overview]
Message-ID: <87ipckaxy8.fsf@gmx.com> (raw)
In-Reply-To: CAMvvmF-1y74Fr=JYyA8+UE7qy4gnpn6w5rB5WKbzQkiqGkz9Gw@mail.gmail.com
Andrew Young <youngar17@gmail.com> writes:
> 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
>
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], 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.
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.
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
next prev parent reply other threads:[~2012-08-15 17:05 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 [this message]
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
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=87ipckaxy8.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).