From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id oP7CG3mqq2N8IAEAbAwnHQ (envelope-from ) for ; Wed, 28 Dec 2022 03:31:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uL+3G3mqq2NsXQEAauVa8A (envelope-from ) for ; Wed, 28 Dec 2022 03:31:21 +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 1A75D1ADE2 for ; Wed, 28 Dec 2022 03:31:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAMDB-0000Nc-Cf; Tue, 27 Dec 2022 21:30:33 -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 1pAMDA-0000N8-28 for emacs-orgmode@gnu.org; Tue, 27 Dec 2022 21:30:32 -0500 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAMD8-0006Uf-6q for emacs-orgmode@gnu.org; Tue, 27 Dec 2022 21:30:31 -0500 Received: by mail-lf1-x135.google.com with SMTP id m6so11495685lfj.11 for ; Tue, 27 Dec 2022 18:30:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=WWV8BnMYxoEie4a2QDl1sFzBusVKk1O8uSo8fDlyNt0=; b=o/e9JNYsHM90H+hnzjsmmFmoGxwBrRfmUwbrM2Fdoy+1V1mc0CDOeR6KJsEiero0op +rD2LLdPC5HCYT9EZtSLFjVtiTOwymLjiekIUL8yCvUPn40zsJs4Tn0V2xOuQr0ahcOO g3ZxFeWmEely9RRi5xiC2BBQf4jI5Wd/hMTP4d2k8ka+YTL66WzJhv+eQITfDzfLbrec ko/USYgSNoHS/V5/pfhML3VfhvubeyfWCnfk8Y92weEo9gWoBVzETH19l+MxcTtsqlKa C8fTXB1A5Iip6ZPVejSWJMlNb3saFgStC8VCXiR0H0vKSit4Z4COWj0GBNeQc58yWj7v Eetw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WWV8BnMYxoEie4a2QDl1sFzBusVKk1O8uSo8fDlyNt0=; b=ZQZtYVmdfp2LvLv7FKAT6VJvSyBgekJFMenJAKsKuV94OJ0ddjtdXSMjJLTrMaiwdw FwWmyk4ZUuRHcsvXSg67e92IQten9L5Si2HKnFqryhup7I6Wql2mdpYwMzC1osAPJClv In2VqGiZ6ffhgxmemo+4c9BFZ+8cQx0J+XKiwGVwgGRZsGfrBrc7rmsSWYz6Ik3VgW7x 9AwJih96NNrroqYivp/96aYvcQzePZtb36GyFTuob6RNoV5bQUJ/VSRcCPIjoZ/C4RbF 6Kt72Ey98I2Vn3fcKGtgz2jRikln6mKGkwh1Fwp7QulKHy2NILC86VpKUCfxoVmJPkEN LYag== X-Gm-Message-State: AFqh2kr9MzKnjhmZzVytti68FWPwzCkRzVZQ6bd9exMCGkVWJ9fRXWgw iXq/JJSVcvsaDioVQIvWFeYglINvImhkyYk4d10qhChwoz9G13bn X-Google-Smtp-Source: AMrXdXs9i/sPnKF5ly5qIatopFQgJt7DXHaew77mbfgFgsC+ikRiUpxPD8UJta/ux9H8CyvhiovwmebPvZv1+Eg+wis= X-Received: by 2002:a05:6512:513:b0:4b5:635c:f330 with SMTP id o19-20020a056512051300b004b5635cf330mr2368324lfb.237.1672194628011; Tue, 27 Dec 2022 18:30:28 -0800 (PST) MIME-Version: 1.0 Received: by 2002:aa6:c266:0:b0:23b:5e81:46ba with HTTP; Tue, 27 Dec 2022 18:30:26 -0800 (PST) In-Reply-To: <87h6xuctqm.fsf@mbork.pl> References: <87h6xuctqm.fsf@mbork.pl> From: Samuel Wales Date: Tue, 27 Dec 2022 19:30:26 -0700 Message-ID: Subject: Re: [OT] org and diff To: Marcin Borkowski Cc: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=samologist@gmail.com; helo=mail-lf1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672194681; 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:dkim-signature; bh=WWV8BnMYxoEie4a2QDl1sFzBusVKk1O8uSo8fDlyNt0=; b=aEcJbxeXssgfBbDl86TfuHdc5MpQiHrUljWokowaHhei2hQBOU/SuFVB725K24/GxKlN5H MEUibKkx2cortFswccATC8sV5HSVwGcIsDUxWILbKmG5U7K29kUKAczjtJ4l0N+ll6raN4 2GFRkwOhlTcrsMcnwA+Pf841A9QspnovhGB2W2ZPZf57yBH/93KXOhOSS3DLB6uFtZlg/u XuixBCeCwBI7b7QBdsgMWeHAb4JDhoQ+CFmO5lOVBxCUZS5Y7m/P8PkTbQocHABTAB0wRe mrlzmOS1lBEVvIsJhPnOAJuB1KrnxjPhMpNdIBoSc7McoqeE9dQ4fzjbNBtuxA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="o/e9JNYs"; 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=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672194681; a=rsa-sha256; cv=none; b=F+zUrsn1u9HfqXogxvMKXX5fSmX5/gRSdKkkcYtqFLnr/RpZ490ZawS/WFPyqD7pVLBgQL I1ebHvosuA5Pq1EaZjtD9RXS/2Vf8izG0PBfAFybKICtqBq2Q1OVzS1XX0vmp2ONqZQmUZ LMKOmsAm9bPqiuWstTVoHEkeKvF3L6LijSq1+JIIriQZvgbnrs8nwk07+nCrNKuQNU1S9m aPY4JaPPUqEm3glnyyCpC06PtsSRNERznNqYMb/D0p/6xGUq5pYvnCC9n2ouND8f6faVPb DK7k57uZ1v20brJybKkCRcUkJKrJb4O+st0yAUZpsA1TmDhohxBNX7tpfir6og== X-Spam-Score: -4.61 X-Migadu-Queue-Id: 1A75D1ADE2 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="o/e9JNYs"; 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=pass (policy=none) header.from=gmail.com X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -4.61 X-TUID: Tkr3hNx9vftE hi marcin, thanks for your blog post on my crash-proof editing idea. more below On 12/17/22, Marcin Borkowski wrote: > > 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 [n.b. i have an still unpubolished package for 30 years that postprocesses diff and is extremely powerful, and it can if you are reviewing an ientire repo changes, to some degree nullify the intermingling issue, but its integration with magit, and magit's bugs with intra-hunk staging [2 bugs ime], make the intermingling an issue. with no bugs, less of an issue, mnerely because it is desirable to use magit instead of merely reviewing it and intra-hunk staging [and killing] is part of that. but i use old magit, with --- +++, istead of new magit, which does not supply headers. idk if new magit fixes the bugs. so really i was askig about the intermingling issue and whetehr it could be mitigated at the magit/git level.] > 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/... not sure what you men to say in this case about discipline. my circumstances if i told you about you'd be surprised. my physical survival is very much at issue and i have no support for dalin with it. i.e. not sure if this was aimed at me or a general comment, and the emphasis i wasn't sure what it was referring to. > >> 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 huh. so it's a hard problem [i.e. parser needed rather than merely kluydging with entries]. :[ > tree-sitter page claims that Org parser is under way, so there's hope > (AFAIK difftastic uses tree-sitter under the hood). great. > > Best, > mbork > > -- > Marcin Borkowski > http://mbork.pl > -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com