From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,MAILING_LIST_MULTI autolearn=ham autolearn_force=no version=3.4.4 Received: from txout-a3-smtp.messagingengine.com (txout-a3-smtp.messagingengine.com [103.168.172.226]) by inbox.vuxu.org (Postfix) with ESMTP id E26D72146D for ; Mon, 13 Jan 2025 03:23:39 +0100 (CET) Received: from localhost.localdomain (kubehost02.phl.internal [10.202.3.2]) by mailtxout.phl.internal (Postfix) with ESMTP id 4330723802B7 for ; Sun, 12 Jan 2025 21:23:39 -0500 (EST) ARC-Authentication-Results: i=2; topicbox.com; arc=pass; dkim=pass (2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=ILNW1E/W header.a=rsa-sha256 header.s=20230601 x-bits=2048; dmarc=pass policy.published-domain-policy=none policy.published-subdomain-policy=quarantine policy.applied-disposition=none policy.evaluated-disposition=none (p=none,sp=quarantine,d=none,d.eval=none) policy.policy-from=p header.from=gmail.com; spf=pass smtp.mailfrom=paul.a.lalonde@gmail.com smtp.helo=mail-pj1-f48.google.com; x-internal-arc=fail (as.1.topicbox.com=pass, ams.1.topicbox.com=fail (message has been altered)) (Message modified while forwarding at Topicbox) ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d= topicbox.com; h=mime-version:references:in-reply-to:from:date :message-id:subject:to:content-type:list-help:list-id:list-post :list-subscribe:reply-to:content-transfer-encoding :list-unsubscribe; s=sysmsg-1; t=1736735019; bh=5M6V5mXROuf5IT4c s79w00E0WRh5EeijXgxF8q6p7tY=; b=lXLqs+r8mLj2W55oCUNbLGzYjizeWCDj xf/HFme7AlUWB+XX594GRtWM01kmktCGPGLRKzYQTXJkI8u0A49kyVRHrPGF7Y5W rUzJYpDa90oQbkQxbFw1Gv6t/31l8mAJF0ahlZbrjTv9OC7e/8qZ0Duc1EU17+g4 Pw9cPKBnk8E= ARC-Seal: i=2; a=rsa-sha256; cv=pass; d=topicbox.com; s=sysmsg-1; t= 1736735019; b=TvqTa13jLeLtH0sNH5aHro2bkIuqSnJtvQTz/QheHQrlk2C4gW tnJA05NZsyiVfkDVQRMuh7OvAjkcomF0EwgRtyUPGxWiWGHMEMRL6ZszAr7m6H2e vyh8CAgQ2un4SQw/HcO2AyM3x9h8eUjYNrWv+oRxGgxIRknOXL0VoPY4Q= Authentication-Results: topicbox.com; arc=pass; dkim=pass (2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=ILNW1E/W header.a=rsa-sha256 header.s=20230601 x-bits=2048; dmarc=pass policy.published-domain-policy=none policy.published-subdomain-policy=quarantine policy.applied-disposition=none policy.evaluated-disposition=none (p=none,sp=quarantine,d=none,d.eval=none) policy.policy-from=p header.from=gmail.com; spf=pass smtp.mailfrom=paul.a.lalonde@gmail.com smtp.helo=mail-pj1-f48.google.com; x-internal-arc=fail (as.1.topicbox.com=pass, ams.1.topicbox.com=fail (message has been altered)) (Message modified while forwarding at Topicbox) X-Received-Authentication-Results: mx.topicbox.com; arc=none (no signatures found); bimi=skipped (DMARC Policy is not at enforcement); dkim=pass (2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=ILNW1E/W header.a=rsa-sha256 header.s=20230601 x-bits=2048; dmarc=pass policy.published-domain-policy=none policy.published-subdomain-policy=quarantine policy.applied-disposition=none policy.evaluated-disposition=none (p=none,sp=quarantine,d=none,d.eval=none) policy.policy-from=p header.from=gmail.com; iprev=pass smtp.remote-ip=209.85.216.48 (mail-pj1-f48.google.com); spf=pass smtp.mailfrom=paul.a.lalonde@gmail.com smtp.helo=mail-pj1-f48.google.com; x-aligned-from=pass (Address match); x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=nTtjflgL; x-me-sender=none; x-ptr=pass smtp.helo=mail-pj1-f48.google.com policy.ptr=mail-pj1-f48.google.com; x-return-mx=pass header.domain=gmail.com policy.is_org=yes (MX Records found: alt4.gmail-smtp-in.l.google.com,alt1.gmail-smtp-in.l.google.com,alt3.gmail-smtp-in.l.google.com,alt2.gmail-smtp-in.l.google.com,gmail-smtp-in.l.google.com); x-return-mx=pass smtp.domain=gmail.com policy.is_org=yes (MX Records found: alt3.gmail-smtp-in.l.google.com,gmail-smtp-in.l.google.com,alt1.gmail-smtp-in.l.google.com,alt4.gmail-smtp-in.l.google.com,alt2.gmail-smtp-in.l.google.com); x-tls=pass smtp.version=TLSv1.3 smtp.cipher=TLS_AES_128_GCM_SHA256 smtp.bits=128/128; x-vs=clean score=0 state=0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=9fans.net; h= mime-version:references:in-reply-to:from:date:message-id:subject :to:content-type:list-help:list-id:list-post:list-subscribe :reply-to:content-transfer-encoding:list-unsubscribe; s=dkim-1; t=1736735019; x=1736821419; bh=J2lzLoppwqMVAMhqXOb1WBbc73lpG5n+ 8oNpj2t/bd4=; b=YJy8lROvY82UeO0Z0TelD+TBqorP7J8OvPUBHxo+2hPbR+cg GnFMJoA+Lq+C5+dITi/kcr10yFDwYk1vdKxoW5uwzcgWs9ZFfNrwDA48yQlt3XxM 3GQ2Oy5eCUmp4pwI5HrXhwAoYoTDgAdkh/j+DLJLV1bawYy2BzdHu30d3N8= Received: from mx.topicbox.com (10-0-3-161.authmilter.topicbox.svc.cluster.local [10.0.3.161]) by tb-mx-1.topicbox.com (Postfix) with ESMTP id D149410031752334 for <9fans@9fans.net>; Sun, 12 Jan 2025 21:22:47 -0500 (EST) Received: from tb-mx-3.topicbox.com (10.0.0.82 [10.0.0.82]) by mx.topicbox.com (Authentication Milter) with ESMTP id DCECE1CD4E1; Sun, 12 Jan 2025 21:22:47 -0500 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=topicbox.com; s=arcseal; t= 1736734967; b=lIVXJOdtG9x0jdh8BcYmDaHHzR2xvjmKZZ15RVKHD0wuzUFeL5 Ff6/Dv6cFGVaF1mWm4RpgwsExsHi11O9u5JzLZI1qxnQX5pYcVNGHCPzvGqL+BcA RfOawaYvtCmSC2rtZCSaGvRFpHr7xd8aN3foIojQ6TG0Lee0XOQng2YNrSnKVApK u47ZojbNlcEHqjFE6H61sMfOqRNalA2sJMxusgbhsQShgv/n6EXLIDP/ZYnn8Enr WgLjlLN8KU64jn446AoCFWPKMcKs2uX1DqqTBOhRJvgmhyuyiyBnEIeYxthWrxcF 1kkZllln71zc7Ga6XkICmO/VfXZycu2gF1sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= topicbox.com; h=mime-version:references:in-reply-to:from:date :message-id:subject:to:content-type; s=arcseal; t=1736734967; bh=79Twf5+CXqoX+xibyYNVGtLRZWQfWonA89vkqs38Cp4=; b=yaPhYEii7U6J EtBKhEEfzSrhYwUQlZadl0f2qDaLLy6CqTWyaVwJnHjb6HOw9JBFlWbcyyZFK1iE 3rb59ek3/7TaYbvXkje750DnOU94qTafuIrufzOcYXqeOuVaE+Zj53+dF70o6JPE oh+qjsgsV6UsmSb9VAQvBXTGX73jBCuzrNyW/YJpkRBK9uPGj9Vkm6JvDj+IOlyc ey6DiO4+f5jjpjtrEt9LSIJblJU+9MonVHQyjjoe8m6pO37HkHwSXm8vXYKWmXOG 3nNhByWSGCWlBuWZH6yQOGG2Lx9duUr7YxPXT0cRszsqu03xSmmTyl77Jc58TqLm O5iDmzczOA== ARC-Authentication-Results: i=1; mx.topicbox.com; arc=none (no signatures found); bimi=skipped (DMARC Policy is not at enforcement); dkim=pass (2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=ILNW1E/W header.a=rsa-sha256 header.s=20230601 x-bits=2048; dmarc=pass policy.published-domain-policy=none policy.published-subdomain-policy=quarantine policy.applied-disposition=none policy.evaluated-disposition=none (p=none,sp=quarantine,d=none,d.eval=none) policy.policy-from=p header.from=gmail.com; iprev=pass smtp.remote-ip=209.85.216.48 (mail-pj1-f48.google.com); spf=pass smtp.mailfrom=paul.a.lalonde@gmail.com smtp.helo=mail-pj1-f48.google.com; x-aligned-from=pass (Address match); x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=nTtjflgL; x-me-sender=none; x-ptr=pass smtp.helo=mail-pj1-f48.google.com policy.ptr=mail-pj1-f48.google.com; x-return-mx=pass header.domain=gmail.com policy.is_org=yes (MX Records found: alt4.gmail-smtp-in.l.google.com,alt1.gmail-smtp-in.l.google.com,alt3.gmail-smtp-in.l.google.com,alt2.gmail-smtp-in.l.google.com,gmail-smtp-in.l.google.com); x-return-mx=pass smtp.domain=gmail.com policy.is_org=yes (MX Records found: alt3.gmail-smtp-in.l.google.com,gmail-smtp-in.l.google.com,alt1.gmail-smtp-in.l.google.com,alt4.gmail-smtp-in.l.google.com,alt2.gmail-smtp-in.l.google.com); x-tls=pass smtp.version=TLSv1.3 smtp.cipher=TLS_AES_128_GCM_SHA256 smtp.bits=128/128; x-vs=clean score=0 state=0 X-ME-VSCause: gggruggvucftvghtrhhoucdtuddrgeefuddrudehfedggeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpeggfhgjhf ffkffuvfgtsegrtderredttdejnecuhfhrohhmpefrrghulhcunfgrlhhonhguvgcuoehp rghulhdrrgdrlhgrlhhonhguvgesghhmrghilhdrtghomheqnecuggftrfgrthhtvghrnh ephfekgedvuefgieffgeevffelteetudehgeelkeevtdekfefgueeivdfgveevveeknecu ffhomhgrihhnpehtohhpihgtsghogidrtghomhenucfkphepvddtledrkeehrddvudeird egkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpedvtdelrdek hedrvdduiedrgeekpdhhvghlohepmhgrihhlqdhpjhduqdhfgeekrdhgohhoghhlvgdrtg homhdpmhgrihhlfhhrohhmpeeophgruhhlrdgrrdhlrghlohhnuggvsehgmhgrihhlrdgt ohhmqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeolehfrghnsheslehfrghnsh drnhgvtheq X-ME-VSScore: 0 X-ME-VSCategory: clean Received-SPF: pass (gmail.com ... _spf.google.com: Sender is authorized to use 'paul.a.lalonde@gmail.com' in 'mfrom' identity (mechanism 'include:_netblocks.google.com' matched)) receiver=mx.topicbox.com; identity=mailfrom; envelope-from="paul.a.lalonde@gmail.com"; helo=mail-pj1-f48.google.com; client-ip=209.85.216.48 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by tb-mx-3.topicbox.com (Postfix) with ESMTPS for <9fans@9fans.net>; Sun, 12 Jan 2025 21:22:47 -0500 (EST) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2f45526dea0so910059a91.1 for <9fans@9fans.net>; Sun, 12 Jan 2025 18:22:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736734966; x=1737339766; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=79Twf5+CXqoX+xibyYNVGtLRZWQfWonA89vkqs38Cp4=; b=nTtjflgLQ0DheyT6z7nFCmXzst7xfXO34fBGxQztOKdhJl0LYE0L0+v/679XLb7VsT Lppug724CMsaSznqNgZt4SAt1wsQ0J4uMH5I++LgqBM7nctQ9Hq0L/Else84a3Ce2szT JFtXph8mEqaDjtVIEcGWqXuS66PwPJm+/a452vSQitNJRrEXxdRi9FyAlIK1aUUHg0Or VOaZaUU3ISDP/qCSgegOZRU4YDDC5xnOo7w2SBuQacqVO1gKZlX2N1AkE7nRCMdjJ0a+ J8CIsdj0ePEoy3I9JnLLyaMFwiGGo4VkZZya0vp+CgfC+efyPFTst2Ob9jb61fN4DwAY T00w== X-Gm-Message-State: AOJu0YxXp9W90nvYz0e6nZoY/tvQmHCdbeFcNqnRDSge334rlE3hIYbK xgBGU27rBWy02//YrY+n8bDyx9WrLEhPu7Ih3PaT8BC4FNcy/QS8z4q6bvZu6dLMLIEU/Rmo0i7 0CmGgixMfyUhx3ptwlSLvG8HvTrCpnRMA X-Gm-Gg: ASbGncvSeqime53s9JRfY8U3pfUtBriTlUsYYRCY/KSc5aiGiKMtUC+TVLq0S74qYuQ iz9gWd7K/J5t9LY741mKr0CFtklqU0m7YJbE+0IvgVviDDhdzOfp1F4txSYAc3Flt0ju1wbM= X-Google-Smtp-Source: AGHT+IGSxhglQeuRyClpbA869WnFKJUNhu2kjFiGE1ypCIdtM5tXSQX+K8lFM8ks2IXzkFhEHGRtGRiV8MD+d2X37WY= X-Received: by 2002:a17:90a:dfcb:b0:2f4:447b:f095 with SMTP id 98e67ed59e1d1-2f5490a9faamr10715278a91.4.1736734965861; Sun, 12 Jan 2025 18:22:45 -0800 (PST) MIME-Version: 1.0 References: <8C320BFCD9575C92C88E36C5A6755FE5@eigenstate.org> In-Reply-To: <8C320BFCD9575C92C88E36C5A6755FE5@eigenstate.org> From: Paul Lalonde Date: Sun, 12 Jan 2025 18:22:34 -0800 X-Gm-Features: AbW1kvYA2ivr7v7VyLnoV0ns8wgAOL-ks2bPmNsTZ6U3zkMHJV7NbJYWQ6Hjrxs Message-ID: Subject: Re: [9fans] Re: Git usage To: 9fans <9fans@9fans.net> Content-Type: multipart/alternative; boundary=000000000000b59406062b8d1e45 Topicbox-Policy-Reasoning: moderate: sender is a member; group holds all messages Topicbox-Message-UUID: 49200ba0-d155-11ef-85e4-10974e313fbd Archived-At: =?UTF-8?B?PGh0dHBzOi8vOWZhbnMudG9waWNib3guY29tL2dyb3Vwcy85?= =?UTF-8?B?ZmFucy9UYzMwOTQ0NTAyOTU4ZTFhMC1NNTk4YjZkYjZlZGM2MTAwNGQzM2Ew?= =?UTF-8?B?NGM3Pg==?= List-Help: List-Id: "9fans" <9fans.9fans.net> List-Post: List-Software: Topicbox v0 List-Subscribe: Precedence: list Reply-To: 9fans <9fans@9fans.net> Content-Transfer-Encoding: 7bit List-Unsubscribe: , Topicbox-Delivery-ID: 2:9fans:437d30aa-c441-11e9-8a57-d036212d11b0:522be890-2105-11eb-b15e-8d699134e1fa:M598b6db6edc61004d33a04c7:1:TqL47Wv_TrTSaz5LcxUoZeeBJT9SzFjoR8lDpiU4lBM --000000000000b59406062b8d1e45 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Ah, yes, my dev history involves git in very large repos with too many committers. The probability that you won't have to rebase to catch up to main was approximately zero, so that just becomes part of the workflow. If you're the only person working in a section of the tree then it's trivial and just runs automatically. You may well have fixed it. I realized that I hadn't done an update after installing this cpu/disk server, so did that. I'll report if I run into the grief again. Also, is there a reason why git/rebase -i doesn't have a "drop" option? I use it frequently when I find myself with a duplicate change from messing up my github fork synchronizations. Paul On Sun, Jan 12, 2025 at 4:37=E2=80=AFPM wrote: > Quoth Paul Lalonde : > > My next question is how to pull new changes from remote while putting my > > new work on top. > > Linus' git does a decent job of that with pull, but my experience with > git9 > > is rather less pleasant. > > > > Looking at it, it seems like a work for git/rebase. Here I'm trying to > > take the work from > > > > fluxcpu% git/branch > > > > heads/some_feature > > > > fluxcpu% git/rebase remotes/origin/regen > > refs/heads/_rebase.working: 7664f5db108af0debf257470be6ac3126ee0206b > > pick 44574500459e507d51e6a359ebe6fd2a1c3df1da Save these files for late= r. > > diff: cannot open b/386/bin/ape//null: file does not exist: > > 'b/386/bin/ape//null' > > diff: cannot open b/386/bin/auth//null: file does not exist: > > 'b/386/bin/auth//null' > > diff: cannot open b/386/bin/aux//null: file does not exist: > > 'b/386/bin/aux//null' > > ... > > > > Rebase appears to be both expensive, and perhaps buggy? I'm not sure > > what's up with the very long scroll of the same error, applied to > different > > files. > > I think most people on 9front git tend to not rebase all that often, > so it could probablly use a bit of love. That said, I'm pretty sure > that I fixed this a while go. > > Do you have a way for me to repro this issue? > > > This is also too slow to be usable, at least for a tree as large as NIX. > > We'll get NIX pruned down into small changes to bind over 9front, but I > > don't see how to update my working branch to track upstream. >=20 > if you have heads/mybranch and remotes/upstream/mybranch, then mybranch > will track upstream. >=20 > again, if you can give a repro, I can look at measuring why it's slow. >=20 > My typical workflow is that I'll work on a commit until it's ready, and > then either push it directly or cherry pick it onto front, and push it; > patches tend to be either an email of webpaste based workflow. >=20 > git/import /mail/fs/mbox/$MSGID >=20 > is killer for pulling in a patch. >=20 > I've got a TODO list item to work on some nice patch queue tools based > on this, gerrit style, but it's not been a priority so far. >=20 ------------------------------------------ 9fans: 9fans Permalink: https://9fans.topicbox.com/groups/9fans/Tc30944502958e1a0-M598b6= db6edc61004d33a04c7 Delivery options: https://9fans.topicbox.com/groups/9fans/subscription --000000000000b59406062b8d1e45 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Ah, yes, my dev history involves git in very l= arge repos with too many committers.  The probability that you won'= ;t have to rebase to catch up to main was approximately zero, so that just = becomes part of the workflow.  If you're the only person working i= n a section of the tree then it's trivial and just runs automatically.&= nbsp;

You may well have fixed it.  I realized tha= t I hadn't done an update after installing this cpu/disk server, so did= that.  I'll report if I run into the grief again.

Also, is there a reason why git/rebase -i doesn't have a &q= uot;drop" option?  I use it frequently when I find myself wi= th a duplicate change from messing up my github fork synchronizations.

Paul

On Sun, Jan 12, 20= 25 at 4:37 PM <ori@eigensta= te.org> wrote:
Quoth Paul Lalonde <paul.a.lalonde@gmail.com>:
> My next question is how to pull new changes from remote while putting = my
> new work on top.
> Linus' git does a decent job of that with pull, but my experience = with git9
> is rather less pleasant.
>
> Looking at it, it seems like a work for git/rebase.  Here I'm= trying to
> take the work from
>
> fluxcpu% git/branch
>
> heads/some_feature
>
> fluxcpu% git/rebase remotes/origin/regen
> refs/heads/_rebase.working: 7664f5db108af0debf257470be6ac3126ee0206b > pick 44574500459e507d51e6a359ebe6fd2a1c3df1da Save these files for lat= er.
> diff: cannot open b/386/bin/ape//null: file does not exist:
> 'b/386/bin/ape//null'
> diff: cannot open b/386/bin/auth//null: file does not exist:
> 'b/386/bin/auth//null'
> diff: cannot open b/386/bin/aux//null: file does not exist:
> 'b/386/bin/aux//null'
> ...
>
> Rebase appears to be both expensive, and perhaps buggy?  I'm = not sure
> what's up with the very long scroll of the same error, applied to = different
> files.

I think most people on 9front git tend to not rebase all that often,
so it could probablly use a bit of love. That said, I'm pretty sure
that I fixed this a while go.

Do you have a way for me to repro this issue?

> This is also too slow to be usable, at least for a tree as large as NI= X.
> We'll get NIX pruned down into small changes to bind over 9front, = but I
> don't see how to update my working branch to track upstream.
=
if you have heads/mybranch and remotes/upstream/mybranch, then mybranch
will track upstream.

again, if you can give a repro, I can look at measuring why it's slow.<= br />
My typical workflow is that I'll work on a commit until it's ready,= and
then either push it directly or cherry pick it onto front, and push it;
patches tend to be either an email of webpaste based workflow.

        git/import /mail/fs/mbox/$MSGID

is killer for pulling in a patch.

I've got a TODO list item to work on some nice patch queue tools based<= br /> on this, gerrit style, but it's not been a priority so far.

=
------------------------------------------
9fans: 9fans
Permalink: https:= //9fans.topicbox.com/groups/9fans/Tc30944502958e1a0-Ma721d15ba8282138b29979= 03
Delivery options: https://9fans.topicbox.com/gro= ups/9fans/subscription
= --000000000000b59406062b8d1e45--