emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: "Samuel Wales" <samologist@gmail.com>
To: Richard Riley <rileyrgdev@googlemail.com>
Cc: emacs-orgmode@gnu.org, Linh Dang <linhd@nortel.com>
Subject: Re: Re: Git recommendations
Date: Sun, 30 Nov 2008 19:29:47 -0700	[thread overview]
Message-ID: <20524da70811301829h76b19f67k801802105a36d00f@mail.gmail.com> (raw)
In-Reply-To: <492b1878.0baa660a.1558.ffff81e4@mx.google.com>

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.

next prev parent reply	other threads:[~2008-12-01  2:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-27 14:44 Git recommendations Richard Riley
2008-10-27 17:53 ` Ross Patterson
2008-10-27 18:22   ` Richard Riley
2008-10-27 18:31     ` Ross Patterson
2008-10-27 18:47       ` Richard Riley
2008-10-27 20:51       ` Mykola Nikishov
2008-10-28 18:40         ` Ross Patterson
2008-11-24 19:44 ` Linh Dang
2008-11-24 21:10   ` Richard Riley
2008-12-01  2:29     ` Samuel Wales [this message]
2008-12-01 14:25       ` Alex Ott
2008-12-01 15:56         ` Richard Riley
2008-12-07 22:15         ` Samuel Wales
2008-12-08 12:36           ` Tim O'Callaghan

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=20524da70811301829h76b19f67k801802105a36d00f@mail.gmail.com \
    --to=samologist@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=linhd@nortel.com \
    --cc=rileyrgdev@googlemail.com \
    /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

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).