From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Samuel Wales" Subject: Re: Re: Git recommendations Date: Sun, 30 Nov 2008 19:29:47 -0700 Message-ID: <20524da70811301829h76b19f67k801802105a36d00f@mail.gmail.com> References: <492b1878.0baa660a.1558.ffff81e4@mx.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L6yXn-0000Y0-Dc for emacs-orgmode@gnu.org; Sun, 30 Nov 2008 21:29:51 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L6yXl-0000WU-V2 for emacs-orgmode@gnu.org; Sun, 30 Nov 2008 21:29:51 -0500 Received: from [199.232.76.173] (port=59535 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L6yXl-0000WK-Pt for emacs-orgmode@gnu.org; Sun, 30 Nov 2008 21:29:49 -0500 Received: from nf-out-0910.google.com ([64.233.182.187]:37270) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L6yXl-0000CG-DQ for emacs-orgmode@gnu.org; Sun, 30 Nov 2008 21:29:49 -0500 Received: by nf-out-0910.google.com with SMTP id c7so1305148nfi.26 for ; Sun, 30 Nov 2008 18:29:47 -0800 (PST) In-Reply-To: <492b1878.0baa660a.1558.ffff81e4@mx.google.com> Content-Disposition: inline List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Richard Riley Cc: emacs-orgmode@gnu.org, Linh Dang Do you know whether any of the git modes allow you to preprocess the files that get diffed or ediffed? For example, let's say that you want to ignore all line moves. In that case, you might run both files (e.g. an old version and the current version) through "sort -u". Then the diff will look funny if you made a lot of changes, but if you only moved lines, it would show up as a zero diff, which is exactly what you want if you don't care about line moves. If you made just a few changes and a lot of line moves, those changes would show up. A more sophisticated algorithm could keep the changed lines in place. Likewise, you could preprocess org files to make diffs cleaner by eliminating all level changes, etc. I have done this in the shell for a long time and found it useful; it would be nice in a git mode, if any support that. Of course, perhaps it could be done in ediff, somehow. I wonder if dvc will win because it has backends.