From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 WM8PN/o7oWIaRgEAbAwnHQ (envelope-from ) for ; Thu, 09 Jun 2022 02:16:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id UKU4Nvo7oWJeyAAAG6o9tA (envelope-from ) for ; Thu, 09 Jun 2022 02:16:58 +0200 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 5608C10B76 for ; Thu, 9 Jun 2022 02:16:58 +0200 (CEST) Received: from localhost ([::1]:34534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nz5r7-0000bL-BP for larch@yhetil.org; Wed, 08 Jun 2022 20:16:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nz5qa-0000aw-0X for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 20:16:24 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:34417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nz5qX-0005o8-Re for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 20:16:23 -0400 Received: by mail-ej1-x629.google.com with SMTP id o7so11140143eja.1 for ; Wed, 08 Jun 2022 17:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=oyjUtok293yMnwYaW/IdXzjVcFkr5ocwexM2DC9+PRw=; b=JmOK0Z4V1DUAYajDTH2Bd4siW0RyNWjjfKxAcHD/f/7yWpgtYKfK/VgWdf1+fkueOo MeDqUDg5oJVJ/iPXOJnVkN6M5+KXh0SrfL26ctwbS/DPKPGhkCp+TV8FLkHgeUmzQ6YU Wt5/CwcR+V02R5PrZyK0C/Dvn6Tbz+Gb2r2BFg9VieuQJLCw8XlI2A5hE0dhRMapqVsA wdiAwOnCbofWTxAAbgZZMmK5VkBbjLGhWXRZIrohkq4PmIAeuwzlFv34s8m2pe0p+B1K Hyo2AMkPyk98IA/CKIR76fqqj7kTrI8TADMeTwRxVadcI7k3/yy476o39ax3kAueHbmZ V8bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=oyjUtok293yMnwYaW/IdXzjVcFkr5ocwexM2DC9+PRw=; b=SQw50RtvSSh/dgaIFTJXZBCojQcAKFdpmwJ60+9abY/bXqfnhl8c0t0m5mCuP7QAJm LxRqrro6r2Gx3xNMR3HYnDbQMdAJWS1BOxmWptlD5VR3YYAeFk9b0gQh1umOmM4VMFAK boL4BZ6MH0FhusvYA6vQbUWKFsP8uWKPdxIPr0LzmCAbY3yYJroEZmHJik9udl1sOSo9 /jFjqhQhSsNJpJECy1uHfNH7xMtMXdgKM10dXxD2BISzRLe6BEbjoyLlpMUaYdU/tDCR Th89//XTBcKVWD5TQJvuYLGFodeIw7pvlrdWLkn8hfh5c9ky6I3emC5Xr8CNvJBPZPDI x5Kw== X-Gm-Message-State: AOAM531/YKyO1fMrOHphmWDqfFhu+BTvi6+yxwJSa4Mx9+n7Is/N109V 0n3Q11s7ZWYhtTu2HbW/oWS+HqCjKZbqGm0/2RE= X-Google-Smtp-Source: ABdhPJwsG1S0K7Q0+Sr1mJ18DcHy2454KbGKJYr7CfQJbU51Vc0OF0JPTm2iwJ5SA8hS6OxkaMq64Nn/x6CQ6KdDspk= X-Received: by 2002:a17:906:38d3:b0:710:daf0:52f8 with SMTP id r19-20020a17090638d300b00710daf052f8mr22687925ejd.406.1654733779897; Wed, 08 Jun 2022 17:16:19 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:906:478b:b0:6fe:f76c:8596 with HTTP; Wed, 8 Jun 2022 17:16:19 -0700 (PDT) In-Reply-To: References: <871qvzucqh.fsf@localhost> From: Samuel Wales Date: Wed, 8 Jun 2022 17:16:19 -0700 Message-ID: Subject: Re: git branch rename and git config q To: Max Nikulin Cc: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=samologist@gmail.com; helo=mail-ej1-x629.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, T_SCC_BODY_TEXT_LINE=-0.01 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654733818; 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=oyjUtok293yMnwYaW/IdXzjVcFkr5ocwexM2DC9+PRw=; b=i+1kOjTnx4P+s8cDLFh3nPljLYceyOQ+vEkIVq8WWcVRd94i//vydWvw/5fT6csp3KuPhp vSQn9t0EcytWoJFyOSFAQ7KBtg1HSgvj77f/EqcJ+KURE3fgV06TTO3moJYVBChAH/Omo+ D49V4J82Jb4LotHxKPuidXFvxTKWsRjOBD5gu7BqMrab5gqx72GDlZt4MUBfJSVV+TiJEQ N3WStVQw/XIFYrhWXO5VV6uvzOI24ra2P7WQ+4NFJLeu+fzvyTR7QhHXl5py17KJQZgPNA HYJ0VJZ4YKyK1/n7tr6sgvlaNIZqn/inkUrq91AnXN4YXpYXfT/rt3qNGIifTA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654733818; a=rsa-sha256; cv=none; b=bFaVB7bzEr4ixAqYOHW06AweSMEVsjvMqwDOEKC+ctLlp0pV5thKl2KQ4ykXnxUXqp0dPf 7njILVFg0MRUdC9vuUl++cTCz5ndehlRd1XdM2jdee5fkXuBcCx5yv5boAS2tKIqFDl1Nw 3k5dkp3jxLN90dEnP7WkuhYfRSeQmhRsnIeXtAVJ5IEISpWLN0xP2l67He3jwnelxn8h+z OcASbPWesHoOPdyNZogqUDJB2lqdnXMWQ9NATaaIctgTeUrO5oGzZkyd+4dulJSzKp9jwo wPGR9L8GZoMP++FclLO1/EpMtt8xNQkJhWg19bHfCPxT/J+lzkK5pwiIjx5RAg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JmOK0Z4V; dmarc=pass (policy=none) header.from=gmail.com; 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: -4.00 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JmOK0Z4V; dmarc=pass (policy=none) header.from=gmail.com; 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: 5608C10B76 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: qh96cQDVD/3F p.s. than k you for the faq link. did not understand the wording re the makefile stuff re wehther relevant. the point about my patches being semantically wrong in principle is a good one but any solution other than submitting my patches and having them accepted would have the same problem i thik. undoing merge turnkey good. On 6/8/22, Samuel Wales wrote: > i /might/ have gotten it fixed. will have to confirm when can. > > takes me time to do things so i have drafts, but it sounds like this > by max is a shortened version, so i tried it: > > vvv > I have not tested the following commands > > git remote set-url origin > https://git.savannah.gnu.org/git/emacs/org-mode.git > git branch --set-upstream-to=bugfix local > git fetch > ^^^ > > i assume that this is an untested script for doing what i want. the > fact that it is turnkey is a huge boon because my cognition and > ability to use computers lmited and have consequences. looks a bit > like a yes to my op q viz. can i do this? > > i greatly appreciate the help from all contributors in addition, even > if not understand all of it or can't do parts. > > the upgrade to recent org might be needed for any fix to the needed > org-capture extension so if this works it is good. > > > so what i did was run those 3 commands [one does not work] and edit > config manually and pull. here is a transcript plus my complete > config. i will have to reproduce using my shell pull so i can get the > diff. cannot do now but cp etc. > > i find editing the config manually more straightforward than running a > command to edit it. > > i THINK this worked. i had to figure out a trivial guess at what to > do to fix maint branch. on clean local branch. transcript: > > vvv > 08-Wed-16-06-47 ...$ cp -a org-mode--my-maint--ok-to-pull > TEST-branch-rename--org-mode--my-maint--ok-to-pull > cd TEST-branch-rename--org-mode--my-maint--ok-to-pull/ > 08-Wed-16-07-25 ...$ 08-Wed-16-07-25 > .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ > 08-Wed-16-07-36 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ > 08-Wed-16-07-36 > .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git remote > set-url origin https://git.savannah.gnu.org/git/emacs/org-mode.git > > 08-Wed-16-07-48 > .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ > 08-Wed-16-07-48 > .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git branch > --set-upstream-to=bugfix local > error: the requested upstream branch 'bugfix' does not exist > hint: > hint: If you are planning on basing your work on an upstream > hint: branch that already exists at the remote, you may need to > hint: run "git fetch" to retrieve it. > hint: > hint: If you are planning to push out a new local branch that > hint: will track its remote counterpart, you may want to use > hint: "git push -u" to set the upstream config as you push. > (1) 08-Wed-16-07-58 > .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git fetch > remote: Counting objects: 4972, done. > remote: Compressing objects: 100% (1487/1487), done. > remote: Total 4972 (delta 3897), reused 4531 (delta 3485) > Receiving objects: 100% (4972/4972), 2.51 MiB | 3.19 MiB/s, done. > Resolving deltas: 100% (3897/3897), completed with 310 local objects. > From https://git.savannah.gnu.org/git/emacs/org-mode > * [new branch] bugfix -> origin/bugfix > dd9105d17..1466950c7 emacs-sync -> origin/emacs-sync > * [new branch] main -> origin/main > * [new tag] release_9.5.4 -> release_9.5.4 > * [new tag] release_9.5 -> release_9.5 > * [new tag] release_9.5.1 -> release_9.5.1 > * [new tag] release_9.5.2 -> release_9.5.2 > * [new tag] release_9.5.3 -> release_9.5.3 > 08-Wed-16-08-59 > .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git branch > --set-upstream-to=bugfix local > error: the requested upstream branch 'bugfix' does not exist > hint: > hint: If you are planning on basing your work on an upstream > hint: branch that already exists at the remote, you may need to > hint: run "git fetch" to retrieve it. > hint: > hint: If you are planning to push out a new local branch that > hint: will track its remote counterpart, you may want to use > hint: "git push -u" to set the upstream config as you push. > (1) 08-Wed-16-09-17 > .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git branch > --set-upstream-to=bugfix local > error: the requested upstream branch 'bugfix' does not exist > hint: > hint: If you are planning on basing your work on an upstream > hint: branch that already exists at the remote, you may need to > hint: run "git fetch" to retrieve it. > hint: > hint: If you are planning to push out a new local branch that > hint: will track its remote counterpart, you may want to use > hint: "git push -u" to set the upstream config as you push. > (1) 08-Wed-16-11-52 > .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git pull > First, rewinding head to replay your work on top of it... > Applying: === alpha agenda mark ring push > Applying: === alpha make agenda display inactive timestamp lines with a new > face > Applying: === alpha location of time span annotation > Applying: === alpha kludge -- put a newline when editing babel source > blocks > Applying: === alpha agenda -- add event, remove colons and spaces, add > comment re ts feature > Applying: === alpha location of possible header insertion so it can be > made varibale pitch > Applying: === alpha remove the parens from ido completion of olpaths > Applying: === alpha comment and change active ts = event change > Applying: === alpha =maybe try to move nokori to today or move by > days, not just one > 08-Wed-16-12-03 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ > ^^^ > > notice that it rebased my patches all by itself. [at least this > time.] not sure if dangerous my case; wfm; i do not push. i do not > get what gets dangerously rewritten. my patches get merge conflicts. > org patches are presumably not rewritten. > > merge conflicts instill rational fear but that is not avoidable here. > and did not even occur for such a huge upgrade. > > uf you are curious about my patches please ask. some are mere guesses > at locations to do things that i am ot capable of. some are ueful > tiny changes. not fsf signed. have contributed tinychanes. > > config: > [after manual editing] > > vvv > [core] > repositoryformatversion = 0 > filemode = true > bare = false > logallrefupdates = true > ignorecase = true > [remote "origin"] > # https://code.orgmode.org https://savannah.nongnu.org > https://sr.ht > url = https://git.savannah.gnu.org/git/emacs/org-mode.git > # url = git://orgmode.org/org-mode.git > #cz is 1h behind orgmode.org -- either should work > # url = git://repo.or.cz/org-mode.git > fetch = +refs/heads/*:refs/remotes/origin/* > [branch "master"] > remote = origin > merge = refs/heads/master > [branch "local"] > rebase = true > remote = origin > merge = refs/heads/bugfix > # merge = refs/heads/master > [branch "testrelease"] > # fixme idk why i have this branch and can maybe del it > remote = origin > merge = refs/heads/maint > [branch "maint"] > remote = origin > merge = refs/heads/maint > [diff] > ^^^ > > -- > The Kafka Pandemic > > A blog about science, health, human rights, and misopathy: > https://thekafkapandemic.blogspot.com > -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com