From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id bM0+H/rVwGCIegAAgWs5BA (envelope-from ) for ; Wed, 09 Jun 2021 16:53:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 6EbBGfrVwGB/XQAAbx9fmQ (envelope-from ) for ; Wed, 09 Jun 2021 14:53:46 +0000 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 EAE4A25A54 for ; Wed, 9 Jun 2021 16:53:45 +0200 (CEST) Received: from localhost ([::1]:58812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqzaS-0000ix-0U for larch@yhetil.org; Wed, 09 Jun 2021 10:53:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqzZo-0000ip-3K for emacs-orgmode@gnu.org; Wed, 09 Jun 2021 10:53:04 -0400 Received: from ciao.gmane.io ([116.202.254.214]:44046) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqzZm-0001Fo-Jf for emacs-orgmode@gnu.org; Wed, 09 Jun 2021 10:53:03 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1lqzZj-0002dd-RA for emacs-orgmode@gnu.org; Wed, 09 Jun 2021 16:52:59 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Maxim Nikulin Subject: Re: literate programming, development log -- ideas? (ominbus reply) Date: Wed, 9 Jun 2021 21:52:49 +0700 Message-ID: References: <643664.1623172504@apollo2.minshall.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 In-Reply-To: Content-Language: en-US Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 28 X-Spam_score: 2.8 X-Spam_bar: ++ X-Spam_report: (2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, NICE_REPLY_A=-0.001, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623250426; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xSOh+qz8sgGekJOsRVXeYyHDCFM17D7yA5txmXzXDJc=; b=Knfd+YvMOHpRFet7WLFE3D2JwacSdYQPrYgYcwodn+aDlRGOIZNXw8SnE1vuryPbKHmCA4 bbgaQ7DGC552J/V5lgwIWMSX38r5svgIni4tlaGZCKGvl1Qbx7arATY7vMxiOwe5ZCvjEN 6thaOvdhPUT7A2rx/Ig3SFV9qdN1wZdpXYC0q1tY5VKsOYbkiIxaci1fvXN8fXgoeYgDfI h32k8KnhLZEfsulqVrCXqHSzJHsbyeOFtdnY7hq31to+iy3zZBdqzlFqzZFQpaSC+Xg+a+ 4HwSp9rRgvzCz+GUTt2VKEqnsZZqIOJMxc5fApZxMfCem46VbdfRKdo6uG4S5g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623250426; a=rsa-sha256; cv=none; b=NfzNOlkaYB2G+GKfbVs2GKFR6A8dPMidr1aqnTGZnwQTlUo1ld9mAygB/+VnM5AJ/eAsQz AIWq94GgC+L8ApBdCsnOIR7Sbev8XNix42pEwGJGFakZlSHamJ32V0OJXaw5TApMp3EsON oCrk0bC295ES9tgkOA58z3ZC/VhdQDDZ2uwnw6gthgyaLK4XlUv0XfptTiGH/HWZzLE8oc AZZCuDWXO7ax6QecWOaEftMmYDUMZX0kkbPmTH5fcfhij5av2KcE1uz8lBxZb4xn51XsR6 ZiXFlWYTAcz0ftqr0WRqY4Qt2HlR+Ba2E4zegB4kQoanQXsfvJC7VZRMtNfKaQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -1.83 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: EAE4A25A54 X-Spam-Score: -1.83 X-Migadu-Scanner: scn1.migadu.com X-TUID: zil4cf//VpxF On 09/06/2021 00:21, Samuel Banya wrote: > > I've noticed that some times after git merge events across a few > machines (ex: I forgot I had already pushed notes for my private notes > on one machine, and had to merge the results from another machine), I'll > get weird "HEAD" and "END" statements inserted by Git. Likely you are writing about merge conflicts. They are not weird, it is just necessary to resolve them manually and commit clean variant. There is no general way to guess what particular user mean when some file in different branches has been modified at the same places. See e.g. https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts I remember one case when *clean* merge resulted in JS file that was syntactically correct but actually had broken code. It is extremely rare accident. > On Tue, Jun 8, 2021, at 1:15 PM, Greg Minshall wrote: >> Eric, when you use something RCS-like as your version control system, i >> assume that makes grepping to find some old note easy enough.  but, >> these days i tend to use git.  when (assuming) you use git, do you have >> some easy way to say "well, i had this code that looked sort of like >> this... where was it?"?  (sorry, that's really a git question, but ...) There is "git log -Gpattern" option that allows to search for code changes. Do not confuse it with "--grep" that is for commit messages. "git gui blame file" can show file state before some line was changed. Probably magit has a similar command.