From: Marcin Borkowski <mbork@mbork.pl>
To: Samuel Wales <samologist@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [OT] org and diff
Date: Sat, 17 Dec 2022 09:36:01 +0100 [thread overview]
Message-ID: <87h6xuctqm.fsf@mbork.pl> (raw)
In-Reply-To: <CAJcAo8ti6MmUtZyY8zFOvAGSVp40Yzop2yFB30EOZEdONyFWEA@mail.gmail.com>
On 2022-12-17, at 03:06, Samuel Wales <samologist@gmail.com> wrote:
> marcin> One question I'd ask is: how important a legible diff is to
> you? I keep my Org files in Git, too, but if /I/ know what was
> changed, I just don't care about diff going nuts and I treat it as
> (more or less) Git's internal implementation detail.
>
> for org, i mostly use git for reviewing changes. it is only one step
> more sophisticated than saving old and diffing.
>
> i have lots of tools for improving diff, but this intermingling
> problem is a showstopper in some cases, like right now where i have
> spent months trying to make sense of months of changes to org files
> that have not been entered into git. i.e. i did not enter every few
Well, "months of changes" seems tough. I sometimes (rarely) have to
enter 2 days' worth of changes... It requires discipline, but
discipline pays off in /so many areas of life/...
> days as normal. i find reviewing changes to be valuable. every once
> in a while i discover data corruption or something that i forgot etc.
Yes, same here.
> i wonder if diff, or difftastic, could be taught or postprocessed to
> do merely one thing: try to preserve stuff between "^\\*+ ". that is
> probably too optimistic, but imagine a --preserve-between option.
I afraid so. Difftastic does not support Org mode format. However, the
tree-sitter page claims that Org parser is under way, so there's hope
(AFAIK difftastic uses tree-sitter under the hood).
Best,
mbork
--
Marcin Borkowski
http://mbork.pl
next prev parent reply other threads:[~2022-12-17 8:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 5:15 [OT] org and diff Samuel Wales
2022-11-13 5:32 ` Ihor Radchenko
2022-11-13 6:06 ` Samuel Wales
2022-11-15 16:58 ` Max Nikulin
2022-11-13 5:38 ` Samuel Wales
2022-11-13 9:32 ` Marcin Borkowski
2022-11-22 3:06 ` Samuel Wales
2022-11-22 3:17 ` Samuel Wales
2022-12-17 2:06 ` Samuel Wales
2022-12-17 8:36 ` Marcin Borkowski [this message]
2022-12-17 8:41 ` Ihor Radchenko
2022-12-28 2:30 ` Samuel Wales
2022-12-28 2:32 ` Samuel Wales
2022-12-28 6:35 ` Marcin Borkowski
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=87h6xuctqm.fsf@mbork.pl \
--to=mbork@mbork.pl \
--cc=emacs-orgmode@gnu.org \
--cc=samologist@gmail.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).