From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gBD5ObF/nWOgGgAAbAwnHQ (envelope-from ) for ; Sat, 17 Dec 2022 09:37:06 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 4HPRObF/nWPPUQEAauVa8A (envelope-from ) for ; Sat, 17 Dec 2022 09:37:05 +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 4B6CD42460 for ; Sat, 17 Dec 2022 09:37:05 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Sg7-0008CI-R0; Sat, 17 Dec 2022 03:36:19 -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 1p6Sg5-0008Bh-Cg for emacs-orgmode@gnu.org; Sat, 17 Dec 2022 03:36:17 -0500 Received: from mail.mojserwer.eu ([195.110.48.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Sg2-0001NL-Ve for emacs-orgmode@gnu.org; Sat, 17 Dec 2022 03:36:16 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.mojserwer.eu (Postfix) with ESMTP id 98B1A14CE27D; Sat, 17 Dec 2022 09:36:09 +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 ROaA8K2V1rhU; Sat, 17 Dec 2022 09:36:06 +0100 (CET) Received: from localhost (178235147073.dynamic-3-poz-k-0-1-0.vectranet.pl [178.235.147.73]) by mail.mojserwer.eu (Postfix) with ESMTPSA id A1F96227159A; Sat, 17 Dec 2022 09:36:05 +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 In-reply-to: Date: Sat, 17 Dec 2022 09:36:01 +0100 Message-ID: <87h6xuctqm.fsf@mbork.pl> 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671266225; a=rsa-sha256; cv=none; b=iTxW5XIcnz4dgzxy/S7RA94eRFswTPgGhTpfwzP06BaufgScI+o+TXQ307tQIs1HMNgQjJ DJVTDyhuKe8BUubzTtIJGO1tc2t39VK4r1QkwK/zEurl98jWm4kWAUhhDVJAfgLKp1RoWy 4FmS0/b4zKbZzETadNNkrkMGX8lLfQzgOdmk9EiLEUExjtO/FX3pSbS1+zJyD9G1raR9Dx dLb1W8mX1WTC/Ao5PWHp+iT7bOdXKNAFdUusZgzEyv9FY6gDo/xZ8ZrT+r65mxQ9+CH0xF GBMRqNp+DHYOT447pBLNRhod60bPHS4wiKZSKAce0P0RwTXnp8CnxC7ppSQ2wg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671266225; 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=xi/VS7lVXgRymDKlkMipKQZpkr4Y5db+QpjfNpy4htk=; b=RKtspcpyL+bEwuJgIDg6MTKSVRZ+wzrwirmGsaZqdeydg44fUThYTR3WjzPm3/F2npr6s4 X5kNDPh+bVKpqrjlzcKxrqGPYTJ8k1BP5Q+cnjKZ173sYh8OWZPTcGkNVRaQTRCXjkjyza YUENkpeFyNxxoJHdlcdaSxEXGjbZLXu1Z+Ys+1Ayk4rhML37pRAqnZftF0b5Msqy5Wc6yy 7Sat3Q2fvKC4n3+XUuqwAFzNh8fmT0twkc8PgsOHpcWMZpUaNpxVYuXkJZUQ3umYy0hJit zEWujcmWX06x6/kPb2UzHDbZPOv/ZcO9U+nOl6zW1CoDFsPxJDIb3r4x8MVZ7A== X-Migadu-Spam-Score: -1.38 X-Spam-Score: -1.38 X-Migadu-Queue-Id: 4B6CD42460 Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none X-Migadu-Scanner: scn1.migadu.com X-TUID: THODGcOv3Ufj On 2022-12-17, at 03:06, Samuel Wales 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