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 nsGuENjjq2O/WgEAbAwnHQ (envelope-from ) for ; Wed, 28 Dec 2022 07:36:08 +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 LbTwD9jjq2OZbwAA9RJhRA (envelope-from ) for ; Wed, 28 Dec 2022 07:36:08 +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 B4A79B4DB for ; Wed, 28 Dec 2022 07:36:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAQ27-0001Bg-DD; Wed, 28 Dec 2022 01:35:23 -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 1pAQ25-0001AQ-40 for emacs-orgmode@gnu.org; Wed, 28 Dec 2022 01:35:21 -0500 Received: from mail.mojserwer.eu ([195.110.48.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAQ22-0006X5-Sz for emacs-orgmode@gnu.org; Wed, 28 Dec 2022 01:35:20 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.mojserwer.eu (Postfix) with ESMTP id 22A237F4B76; Wed, 28 Dec 2022 07:35:13 +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 YFpcMiGzIey2; Wed, 28 Dec 2022 07:35:09 +0100 (CET) Received: from localhost (178235147137.dynamic-3-poz-k-0-1-0.vectranet.pl [178.235.147.137]) by mail.mojserwer.eu (Postfix) with ESMTPSA id 9FD177F74D1; Wed, 28 Dec 2022 07:35:09 +0100 (CET) References: <87h6xuctqm.fsf@mbork.pl> 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: Wed, 28 Dec 2022 07:35:06 +0100 Message-ID: <87a638rq79.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=1672209368; a=rsa-sha256; cv=none; b=OGbt8nPKizgjjig4Hp5aAIn6MMRYqXpUwkyf2YJSCm0+uRct2mxfxC7n9ZPJv8+obkuvRz 0VaHaU5t3xC0fRjGSvbT6JBg6jV9i7k/ulx9j9dqI2LL0yMuZ7WaO33/7CNk6WunBqNsuW 1T0E7i0cBqizUz4Lo72qdmpipPN2Ve9gufrnx9taymtK7wynPyeXB6Ffb+YEsDbG/lASkh e6zPt5WvHiKT3XIsWVOzUm576qCZuWuUuqlc7QfzEIYeCeKlIONbwnjK1jUYs/GZIW4Rre KiSqWDCtl9Nt9RW8RXiTVKkeSqGR81EjDwk+I1UpRbzLIKsvutpP1nkFEr7KPg== 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=1672209368; 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=xDBIbZbh+tMp6+aHbuuWDlN/MlCeHI2SBdQJVixcAJ0=; b=Oy76IhWvBMAyDxzLVAapwqMPfys1PEhG0VLTyZtsa4Nky39coy8mvgCwmMj5GsLJ1yTkIn yY40n8eSB4VcqA5wCMeFYwWWEDwkCN3npgbV809Kdfw2tXEa7WUbVHykuIgfqEq12tAM12 9nHkekf+Wabnm/px7iB0gkDhUA5A2KiEVNBFZ2kGVtPanhDHH5FnvjWDLN/fgdWtVLZSz0 8W3ulaPuZQiXEYymILifkqMZ8H/Trt23cGdn5tHbyk5YBfqodC3rbWbvtzE2j5TcXdSgdS nivtEQ53GuCLMIG6C981T4WS8FZqtH4MhFmrvutEdJJKEEQX/xi1Frw0tJzRmw== X-Spam-Score: -2.13 X-Migadu-Queue-Id: B4A79B4DB 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: scn0.migadu.com X-Migadu-Spam-Score: -2.13 X-TUID: ocv6//G4BHfq On 2022-12-28, at 03:30, Samuel Wales wrote: > hi marcin, > > thanks for your blog post on my crash-proof editing idea. You're welcome! :-) In fact, it was an interesting exercise. > > 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. General comment. I meant that committing my changes (almost) every day requires serious discipline, and I worked pretty hard to acquire it. Also, I do not claim that everyone can learn it like me - people are /very/ different... OTOH, you might consider "outsourcing the discipline". One way would be to set up some kind of reminder to review/commit the changes every day. (That's more or less what I did, though I used a heavy-weight type of reminder: https://www.beeminder.com/ .) Another could be to use some tool to do the committing for you (see e.g. https://stackoverflow.com/q/420143/1181665), though then you lose the "review" part. (Still, with tools like `git log --grep' and/or `git blame' you might find that this is good enough.) Hth, -- Marcin Borkowski http://mbork.pl