emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Charles C. Berry" <ccberry@ucsd.edu>
To: Marcin Borkowski <mbork@mbork.pl>
Cc: emacs-orgmode@gnu.org
Subject: Re: backporting changes to exported results for collaborative editing
Date: Tue, 7 Feb 2017 10:20:37 -0800	[thread overview]
Message-ID: <alpine.OSX.2.20.1702070952580.1364@charles-berrys-macbook.local> (raw)
In-Reply-To: <874m06tvld.fsf@mbork.pl>

On Tue, 7 Feb 2017, Marcin Borkowski wrote:

>
> On 2017-02-07, at 02:15, Samuel Wales <samologist@gmail.com> wrote:
>
>> suppose you export a subtree to ascii or html, and then a bunch of
>> people want to help you edit it.  obviously you want the changes back
>> in org.
>>
>> obviously the best would be if you could give them the source,
>> complete with comments.  but assume that they are not computer people,
>> and not org people, and you don't want to give them your irrelevant
>> comments.
>>
>> also assume you also don't want to give them your irrelevant tasks and
>> you do not use org-export-with-tasks.
>>
>> it might be that i already know the answer: just do the best you can
>> with diff, and request small sets of changes at a time, or request
>> manual instructions for changes.  but perhaps you have ideas?
>
> Maybe this could be automated a bit?  Like, org -> markdown, then
> people's edits, then diff generating a patch, then some tool existing
> only in my dreams currently that converts the md patch to an org patch,
> and then apply that patch to the original org?  For small enough
> changes, that could actually work, no?
>

Maybe, but this sequence might be easier:

- export subtree to md =edit-me.md= (body-only not needed but cleaner)

- distribute to editor and retrieve as =editted.md=

- in a shell run ~pandoc -o editted.org editted.md~

- M-x ediff-regions RET
   - select all of =editted.org=
   - select original subtree
   - Use `##' to skip the whitespace only diffs.
   - resolve the differences as appropriate and/or save the diffs.


Babel blocks/results are *not* be handled seamlessly, so more would
need to be done if your editor wants to revise them. Otherwise, just
skip them.

I guess this might work with ascii or html, but I've not tried it.


Chuck

      reply	other threads:[~2017-02-07 18:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-07  1:15 backporting changes to exported results for collaborative editing Samuel Wales
2017-02-07  5:31 ` Marcin Borkowski
2017-02-07 18:20   ` Charles C. Berry [this message]

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=alpine.OSX.2.20.1702070952580.1364@charles-berrys-macbook.local \
    --to=ccberry@ucsd.edu \
    --cc=emacs-orgmode@gnu.org \
    --cc=mbork@mbork.pl \
    /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).