From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rustom Mody Subject: Re: Org, Diffs, and Version Control Date: Wed, 19 Oct 2011 20:32:45 +0530 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=0015176f03ccf512e004afa8211b Return-path: Received: from eggs.gnu.org ([140.186.70.92]:47302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGXfN-0005aP-VD for emacs-orgmode@gnu.org; Wed, 19 Oct 2011 11:02:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGXfM-0006fc-2W for emacs-orgmode@gnu.org; Wed, 19 Oct 2011 11:02:49 -0400 Received: from mail-iy0-f169.google.com ([209.85.210.169]:54993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGXfL-0006fK-QJ for emacs-orgmode@gnu.org; Wed, 19 Oct 2011 11:02:47 -0400 Received: by iagf6 with SMTP id f6so2623921iag.0 for ; Wed, 19 Oct 2011 08:02:46 -0700 (PDT) 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode --0015176f03ccf512e004afa8211b Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable > > Dave Abrahams boostpro.com> wrote: > > > > I was wondering what other people do. > > I am using http://www.mayrhofer.eu.org/dvcs-autosync for > automatically committing of changes but without activated XMPP sync > feature (so far). > > The already mentioned =ABgit diff --color-words=BB helps me a lot when > examining my git history. > > -- > Karl Voit > dvcs-autosync is an interesting project The OPs question IIUC is orthogonal to it. The problem as I see it is that org mode docs are two things: -- they are text mode data (when in emacs mode) -- hierarchical data (when in org-specific mode) Diff unfortunately does not understand the hierarchical view. I tried to see if xmldiff will run And if it did then try pipe the output of org-docbook-export to it. Unfortunately my attempts at getting xmldiff to run did not work --0015176f03ccf512e004afa8211b Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Dave Abrahams <= ;dave <at> boostpro.com> wrote= :
>
> I was wondering what other people do.

I am using http://www.mayrhofer.eu.org= /dvcs-autosync for
automatically committing of changes but without a= ctivated XMPP sync
feature (so far).

The already mentioned =ABgit diff --color-words=BB= helps me a lot when
examining my git history.

--
Karl Voit

dvcs-autosync is an interesting project
The OPs= question IIUC is orthogonal to it.
The problem as I see it is that org mode docs are two things:
-- they ar= e text mode data (when in emacs mode)
-- hierarchical data (when in org-= specific mode)

Diff=A0 unfortunately does not understand the hierarc= hical view.

I tried to see if xmldiff will run
And if it did then try pipe the o= utput of org-docbook-export to it.

Unfortunately my attempts at gett= ing xmldiff to run did not work


--0015176f03ccf512e004afa8211b--