From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Charles C. Berry" Subject: Re: backporting changes to exported results for collaborative editing Date: Tue, 7 Feb 2017 10:20:37 -0800 Message-ID: References: <874m06tvld.fsf@mbork.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbANv-0002cd-02 for emacs-orgmode@gnu.org; Tue, 07 Feb 2017 13:21:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cbANs-00034s-9l for emacs-orgmode@gnu.org; Tue, 07 Feb 2017 13:20:58 -0500 Received: from iport-acv4-out.ucsd.edu ([132.239.0.7]:20406) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1cbANr-000341-OC for emacs-orgmode@gnu.org; Tue, 07 Feb 2017 13:20:56 -0500 In-Reply-To: <874m06tvld.fsf@mbork.pl> 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" To: Marcin Borkowski Cc: emacs-orgmode@gnu.org On Tue, 7 Feb 2017, Marcin Borkowski wrote: > > On 2017-02-07, at 02:15, Samuel Wales 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