From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OMitM4mCnmRRnQAASxT56A (envelope-from ) for ; Fri, 30 Jun 2023 09:21:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uGWzM4mCnmRpsgAAauVa8A (envelope-from ) for ; Fri, 30 Jun 2023 09:21:45 +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 6158E2D491 for ; Fri, 30 Jun 2023 09:21:45 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8Qx-0003D7-Hx; Fri, 30 Jun 2023 03:20:47 -0400 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 1qF8Qw-0003Cm-Cl for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 03:20:46 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8Qu-0006cA-Ff for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 03:20:46 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4f8680d8bf2so413843e87.1 for ; Fri, 30 Jun 2023 00:20:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688109642; x=1690701642; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=vTs1CgJWcCL8X22u2YsX41HUdNscGBNBULKPuj+0IsA=; b=o7eSefpgJh92qf4HFbkefeMX+sUxteCKu02bJ7mFSfK7jbOwKUD/nc9tSE2mbQYurY FzB8jPQco7FzVl+v6VPlv3JHZpmW7XJ8Gh7qkzrDCzUw1pfUooVGAWiJQSoJ4JPitn1T YicKZ49e3bHEwJJstx5xvuStsZvuLdEPRitm8e8cpGIZ/Zhc8SbzLe7IEHq6FlvRjw92 w/P+w2y/84PXLyzmMJrZUw/zewnf6V05W5yBRzMi0V+Hp0SA7OzoVrclAiTlYcPRWPYz zRAwUSW1P9+SR6RcHVrKbg1PZd6XNQHa58YUwK7yqg3b1QYwiW4ZFZ5W9iwyFCuHSgan 9IWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688109642; x=1690701642; h=content-transfer-encoding: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=vTs1CgJWcCL8X22u2YsX41HUdNscGBNBULKPuj+0IsA=; b=TDu7QBU9rIGlzAQlRw3IvUF3V5YyutGfXJJdB0f3ciiT3g3geaSEX5XFcdmQE3l9l1 17DhigMtFl8G5YWvr9OWzQ09qPrlsD5PUBRd2BBmsqsEXyohrN3G9tjCQlcps5DNpGjW KE+/kPEAJqI2Y24vnxCIY+fl4apLsAArhM5WRkqHlVQeCpn1eU1Y3/JFg38K/d+Z3u3U gemjaIz3SZ1Md2mOcoXdy7UtwoKrK/gv6lzpwVN3OfsFXF9cfVlRrRh+KbBmErNDW5k5 qwhVdXqJN3DFknkW5GyS1S/UEYcZjPt3YRLZEacn9wX4ozIUqdEsfZjBapnAleM9vn8Z JGEw== X-Gm-Message-State: ABy/qLadw0zYyvIGrVUxaM6U7P02Ydwx3l/vOucmQnfXoobbL+jzuOUa JW99wCtbMg2nzgujdk7aKMK5JYLuP+44J6PYJVgDhr6SS5wqPw== X-Google-Smtp-Source: APBJJlEtNmr3Of1e96Hez8UfJb60JU4dOXtoTg5iBGqcu77ISHrJE2nd09V3iUwPDGffI7LCToXnFv1QaLvy/sCfehM= X-Received: by 2002:a2e:b16c:0:b0:2b6:9b02:cf1c with SMTP id a12-20020a2eb16c000000b002b69b02cf1cmr964268ljm.2.1688109642114; Fri, 30 Jun 2023 00:20:42 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:aa6:c54b:0:b0:268:94be:fdc7 with HTTP; Fri, 30 Jun 2023 00:20:40 -0700 (PDT) In-Reply-To: <2bc86b92-5e25-b509-bcda-b8f6c12323d1@gmail.com> References: <2bc86b92-5e25-b509-bcda-b8f6c12323d1@gmail.com> From: Samuel Wales Date: Fri, 30 Jun 2023 00:20:40 -0700 Message-ID: Subject: Re: basic git To: Dumitru Sipos Cc: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::12b; envelope-from=samologist@gmail.com; helo=mail-lf1-x12b.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-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=1688109705; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=vTs1CgJWcCL8X22u2YsX41HUdNscGBNBULKPuj+0IsA=; b=MGq+rH7r0wjDo5GWpGjjVTB39TxtY8s0NeTBy1nbIJboSUD4/q+5XM/n05epRu++Sz4Gtc vLVd08PSNupJj+8MNfCts8xyzilBa/Ugz04TF0BoDDDKMkhDjNs6tGKODznQ4IcJrBBvh7 kQ3ZrukxxPoGk20T4RdIOnxy1g/T/9/BVodpEEVJCRvuO9mTlLZgi2gNWgax9dYv5zNQJQ juFO4jVptttn5sEt1PF7liEyKPheFyTWuOGmzYHkKRVb9EFkFUjEQBOJquxxoqtakVWvUz VuvaYdHEuVee8Krf1PFfyD08E0gmEthLcuX4JlTwNZSTLwOqpVletRhWFtH+8A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=o7eSefpg; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688109705; a=rsa-sha256; cv=none; b=iGd5lP0D8UglDpBEEJSEX4SVvarmmFCP6+0/3aLibdTh1ipHHx1hi29KjxuZVC4S54Pvb6 lns0j9yVn93STi1QqdSPgW+7ahMs6OMpfC/bbhvyR503elPsIPwCapvTzwzJiyhnvfpq6d xPl1xTNAAJLyOd79w2b3V8OV20RmefuOpIX/2G9CP9kXF4SV+8YMjNk1cE7izhDq5P1BFO anCW1z00wXcWlIns+4xveZO00YTfHA5mWbfrrsx426JbnrApTPwk/3DkrylORucp3zVcvn i3qHGRmad54FeMMy0obegXzwVzxGjIPiKyLYlPehJAhquX/hiWfYH2jnpQMSRg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -6.42 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=o7eSefpg; 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: 6158E2D491 X-Spam-Score: -6.42 X-TUID: +t/L7eMeFrpq i did it a few times, it broke, i did what you did, which is really the same except like -a, it works, i moved that to my dir, it works for now. thanks. older git. =3D=3D=3D apropos of nothing, btw what does one do to make org these days? make cleanall;make? make oldorg? as for other repos [i keep multiple copies for speed in switching for testing] to clean up an old org with a local.mk do i just delete that file? can i keep doing make oldorg? On 6/30/23, Dumitru Sipos wrote: > It behaves quite normally on my side: > > $ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git > Cloning into 'org-mode'... > remote: Counting objects: 141138, done. > remote: Compressing objects: 100% (30420/30420), done. > remote: Total 141138 (delta 110608), reused 141085 (delta 110576) > Receiving objects: 100% (141138/141138), 96.60 MiB | 21.35 MiB/s, done. > Resolving deltas: 100% (110608/110608), done. > > $ cd org-mode/ > > $ git branch -a > * main > =C2=A0 remotes/origin/HEAD -> origin/main > =C2=A0 remotes/origin/bugfix > =C2=A0 remotes/origin/emacs-sync > =C2=A0 remotes/origin/main > > $ git checkout bugfix > branch 'bugfix' set up to track 'origin/bugfix'. > Switched to a new branch 'bugfix' > > $ git branch -a > * bugfix > =C2=A0 main > =C2=A0 remotes/origin/HEAD -> origin/main > =C2=A0 remotes/origin/bugfix > =C2=A0 remotes/origin/emacs-sync > =C2=A0 remotes/origin/main > > $ git pull > Already up to date. > > $ git pull origin bugfix > From https://git.savannah.gnu.org/git/emacs/org-mode > =C2=A0* branch=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bugfix=C2=A0=C2=A0=C2=A0=C2=A0 -> FETCH_H= EAD > Already up to date. > > $ git --version > git version 2.39.0 > > On 30-Jun-23 08:56, Samuel Wales wrote: >> how can a freshly cloned bugfix be any different from upstream? >> >> On 6/29/23, Samuel Wales wrote: >>> i pulled vanilla bugfix and got errors. i deleted the repo, cloned >>> org, did git checkout bugfix, pulled, and still got errors. >>> >>> git clone https://git.savannah.gnu.org/git/emacs/org-mode.git >>> >>> i am gitophobic. >>> >>> =3D=3D=3D >>> On branch bugfix >>> Your branch and 'origin/bugfix' have diverged, >>> and have 424 and 3 different commits each, respectively. >>> (use "git pull" to merge the remote branch into yours) >>> >>> You have unmerged paths. >>> (fix conflicts and run "git commit") >>> (use "git merge --abort" to abort the merge) >>> >>> Unmerged paths: >>> (use "git add ..." to mark resolution) >>> >>> both modified: lisp/org.el >>> >>> no changes added to commit (use "git add" and/or "git commit -a") >>> =3D=3D=3D >>> >>> the merge conflict is >>> >>> <<<<<<< HEAD >>> ;; Version: 9.7-pre >>> =3D=3D=3D=3D=3D=3D=3D >>> ;; Version: 9.6.7 >>>>>>>>>> 7da765e459384f68d764589c94fd26472f1c3361 >>> thanks for anything that will get me back to my old habits of just >>> having a repo and pulling it. >>> >>> p.s. i HATE git. >>> >>> -- >>> 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 >>> >> > > --=20 The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com