From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UPJ3GAa6cGPvcQEAbAwnHQ (envelope-from ) for ; Sun, 13 Nov 2022 10:33:58 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id wzF7GAa6cGMFmQAA9RJhRA (envelope-from ) for ; Sun, 13 Nov 2022 10:33:58 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B5FB13EC1A for ; Sun, 13 Nov 2022 10:33:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ou9MO-0004Rs-TA; Sun, 13 Nov 2022 04:33:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ou9M3-0004RU-Vt for emacs-orgmode@gnu.org; Sun, 13 Nov 2022 04:32:43 -0500 Received: from mail.mojserwer.eu ([195.110.48.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ou9Lz-0007z8-JE for emacs-orgmode@gnu.org; Sun, 13 Nov 2022 04:32:43 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.mojserwer.eu (Postfix) with ESMTP id CF87D7B3AD2; Sun, 13 Nov 2022 10:32:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail.mojserwer.eu Received: from mail.mojserwer.eu ([127.0.0.1]) by localhost (mail.mojserwer.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QuEbjsz6ehqJ; Sun, 13 Nov 2022 10:32:30 +0100 (CET) Received: from localhost (178235147171.dynamic-3-poz-k-0-1-0.vectranet.pl [178.235.147.171]) by mail.mojserwer.eu (Postfix) with ESMTPSA id A744D1BD1931; Sun, 13 Nov 2022 10:32:30 +0100 (CET) References: User-agent: mu4e 1.1.0; emacs 29.0.50 From: Marcin Borkowski To: Samuel Wales Cc: emacs-orgmode@gnu.org Subject: Re: [OT] org and diff Message-ID: <87r0y7ci9o.fsf@mbork.pl> In-reply-to: Date: Sun, 13 Nov 2022 10:32:29 +0100 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=195.110.48.8; envelope-from=mbork@mbork.pl; helo=mail.mojserwer.eu X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668332038; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=HY/Ovs1diNldLzgXXFEYqcOSR4LD8ukwOmISH7sG+MA=; b=PSkoSt+cEN3EwzoGPmkleV6M3ueUMclPm3dLSsoE9+nkerXOPGuYwKHzKPKJt0K0ZUwtKJ /RCm3sqt39Wt9hXoZN9czjdUBTLcY6K/yr/TQRqL4/XrtIJzykSohBhGKBdOMbucObQ/6N g92T6SMdS7DaJXz4S1nAMKaNEzlLDM4U8a/yZmgpPB9tYwZcqi/Ib/WXz5VoAuHhsReb73 mcuQbi6YfFl/JHjxtzUSc3LwS74BwEJ0+7qnW/XhW31+Phr3WL/FNPwufs7EYy4q3+EjgM Wt6v3ajTwdCxzS0B4sHVJq+HSP11FuxA4W/w3l4IMpywMXouImrnx6oeh1gKRw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668332038; a=rsa-sha256; cv=none; b=tfv9Z8gOhsi19lsEkXepj5M91B3lMq4+Jsm4ccXQbIfYEh8RCmLqawRThGmBSKr9ClpI56 qLGJyuHw9AGRuRfrTjo3rxfZz5FRwlLQxjOig11pNaKfVTTQJwVwRTe98kJjDRoiuKbhUc s6dZBBx0JPCnzQkLjP9fT/ug6sYhnx18uk2c18faL6+smv3hs/KKFHMi9mOT2tNkvjyTpy VCsSFOK8OQNMHzIjOepVNxLTj2ETZA+NqmWYCa859bfwB/Q8xmO3ZyIVFGH/vJDTgqI6ff nIu4oQsDYyL44fw1XSvCERIksMtTaQOF4408buhWXICeoU7shSuzpaSgPa4q6w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.45 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B5FB13EC1A X-Spam-Score: -1.45 X-Migadu-Scanner: scn1.migadu.com X-TUID: O8PFR6UAf2qD On 2022-11-13, at 06:15, Samuel Wales wrote: > But something drives me crazy. Probably not too Org-related, but it > might be. I just want to know why, is all. > [...] diff goes insane. I think this is a known problem with diff, which is inherently line-based and knows nothing about actual syntax of the underlying language. FWIW, if things like this happen to me (and they do happen a lot, especially when I'm doing code review), I abandon diff and use difftastic (https://difftastic.wilfred.me.uk/) instead. Surprisingly, difftastic seems not to support Org syntax. 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. Just my 2cents (not too helpful, I'm afraid...) -- Marcin Borkowski http://mbork.pl