From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Abrahams <dave@boostpro.com>
Subject: Org, Diffs, and Version Control
Date: Sun, 16 Oct 2011 10:25:32 -0400
Message-ID: <m2d3dx109v.fsf@pluto.luannocracy.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:35660)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1RFRpd-0001g3-34
	for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 10:36:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1RFRpc-00062J-0D
	for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 10:36:53 -0400
Received: from lo.gmane.org ([80.91.229.12]:56078)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1RFRpb-00062D-Q8
	for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 10:36:51 -0400
Received: from list by lo.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1RFRpY-0002yJ-DB
	for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 16:36:48 +0200
Received: from 207-172-223-249.c3-0.smr-ubr3.sbo-smr.ma.static.cable.rcn.com
	([207.172.223.249])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sun, 16 Oct 2011 16:36:47 +0200
Received: from dave by
	207-172-223-249.c3-0.smr-ubr3.sbo-smr.ma.static.cable.rcn.com
	with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sun, 16 Oct 2011 16:36:47 +0200
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: emacs-orgmode@gnu.org


As I've been working on a fairly large Org outline over the past few
days, I've discovered that the format is very ill-suited to management
and review by (known) version control tools, like Git.  Indentation is
always changing and volatile information like tags and priorities
tends to mix with headlines, which makes diffs very hard to track.  This
is to say nothing of the fact that diff itself is a poor format for
understanding changes that simply reorganize parts of documents.

I was wondering what other people do.  I want to make sure I understand
the changes I'm making to my document and that I haven't unintentionally
wiped out a great deal of important material (all the more likely to
happen without me noticing because of Org's folding).

Hints most appreciated,

-- 
Dave Abrahams
BoostPro Computing
http://www.boostpro.com