Rocksolid Light

Welcome to novaBBS (click a section below)

mail  files  register  newsreader  groups  login

Message-ID:  

<lilo> Fairlight: udp is the light margarine of tcp/ip transport protocols :) -- Seen on #Linux


devel / comp.lang.python / Re: Track 3.9 instead of 3.10?

SubjectAuthor
o Re: Track 3.9 instead of 3.10?Chris Angelico

1
Re: Track 3.9 instead of 3.10?

<mailman.268.1627399854.4164.python-list@python.org>

  copy mid

https://www.novabbs.com/devel/article-flat.php?id=14318&group=comp.lang.python#14318

  copy link   Newsgroups: comp.lang.python
Path: i2pn2.org!i2pn.org!news.swapon.de!fu-berlin.de!uni-berlin.de!not-for-mail
From: ros...@gmail.com (Chris Angelico)
Newsgroups: comp.lang.python
Subject: Re: Track 3.9 instead of 3.10?
Date: Wed, 28 Jul 2021 01:30:40 +1000
Lines: 28
Message-ID: <mailman.268.1627399854.4164.python-list@python.org>
References: <CANc-5Ux71DBhP2_sBZy69fhTefcM0t+gYosebdqjVx_Q=RYbqg@mail.gmail.com>
<CAPTjJmqT4e3mob+mYitA2J7ZfLTvSqXeDQvsaDgfEAZOi=PU0Q@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
X-Trace: news.uni-berlin.de bh85VmVtwDvlPJEdDt7g1gTd3kNmg57UzITA3DE0SBuQ==
Return-Path: <rosuav@gmail.com>
X-Original-To: python-list@python.org
Delivered-To: python-list@mail.python.org
Authentication-Results: mail.python.org; dkim=pass
reason="2048-bit key; unprotected key"
header.d=gmail.com header.i=@gmail.com header.b=OzPDCo3j;
dkim-adsp=pass; dkim-atps=neutral
X-Spam-Status: OK 0.001
X-Spam-Evidence: '*H*': 1.00; '*S*': 0.00; 'url-ip:140.82/16': 0.03;
'jul': 0.04; '(assuming': 0.09; 'diff': 0.09; 'fork': 0.09; 'git':
0.09; 'subject:instead': 0.09; 'url-ip:140/8': 0.12; 'url:github':
0.13; '3.10': 0.16; '3.9': 0.16; 'chrisa': 0.16;
'from:addr:rosuav': 0.16; 'from:name:chris angelico': 0.16;
'instead.': 0.16; 'montanaro': 0.16; 'received:209.85.166.174':
0.16; 'received:mail-il1-f174.google.com': 0.16; 'subject:3.10':
0.16; 'url:cpython': 0.16; 'wrote:': 0.16; 'that.': 0.16;
"aren't": 0.20; "i've": 0.22; 'machine': 0.22; "i'd": 0.23;
'to:addr:python-list': 0.23; 'thinking': 0.26; 'creating': 0.27;
'there': 0.31; 'think': 0.31; 'do.': 0.32; 'to:name:python': 0.32;
'message-id:@mail.gmail.com': 0.33; 'received:209.85.166': 0.33;
'header:In-Reply-To:1': 0.33; 'received:google.com': 0.34;
'necessarily': 0.35; 'one.': 0.35; 'track': 0.35; 'url-
ip:104.22/16': 0.35; 'from:addr:gmail.com': 0.35; 'trying': 0.36;
'applying': 0.37; 'changes': 0.37; 'way': 0.37; 'received:209.85':
0.38; 'those': 0.38; 'received:209': 0.38; 'example': 0.40;
'could': 0.40; 'branch': 0.40; 'check': 0.62; 'outside': 0.63;
'top': 0.63; 'url-ip:172.67/16': 0.64; 'your': 0.64; 'within':
0.68; 'virtual': 0.69; '2021': 0.84; 'url-ip:172.67.12/24': 0.84
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:references:in-reply-to:from:date:message-id:subject:to;
bh=7z30sXMzzShaB71A57j5aPkxiRnM3VVvTD7R1SqLoVE=;
b=OzPDCo3jq5Ebw1XhWXYKEHk7X+K1C5djJQP0tf8xy7JoGOl0p+ZBWApR6mh339gLFU
UiOo8MzkXfje8ayIJSP7RAEXLH7oX5tNZ9YdPtU1hOHb+06+ewWlmZ0/MU5G4zdkBWEH
AmyY47YLixEM/6EpccCevU5eu74e9VAullTikSkRAP0KOKNXEpnyVMGlFzzQmPDWHn7u
5ciknRjxeFy/CLRnDGBIpXV2I/T/KYXwss1f4sdAGj7eT/lFs+BzHLykObqyrGWDx6GE
64asBJuY1Godvg3VfI9+MAruzHsyv/GZtSzdlpV+RNxF8pxN8GA+HUsNEVjDrfgk+j2J
DSsg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:references:in-reply-to:from:date
:message-id:subject:to;
bh=7z30sXMzzShaB71A57j5aPkxiRnM3VVvTD7R1SqLoVE=;
b=E/W4d9tjIBxM8CC7//2jzmKuoOfpoc4uH9sK+fh+QiqskHdVyS0ft1OKozw1n/wMOt
eIjNsyDoCjWBTLvsoHmYfsUtbvHP61ux6/kGE3cs8LmWEPNfuUXqOuyUMEMtKp2Li2yd
oqM71jTvRIm2PtCPSlknVotKnovavycbwFi7XZe1bjUzG0LiTHp16vSRSayVv2sfsMwA
kSzzUciuKgLwGOgGETe4Tmq9J5c0BFax8aOzUPx1+a1gjHQtQjeZ2QTrZ83wkFtqMo1V
Plta8q98xqNBr04JWpl9T4GMjlfDwwUSZvyUePSN3QEw/h+ocCNlePYoSMc9rOGkffAE
SsdQ==
X-Gm-Message-State: AOAM530fj+u2uB4Ca0w/PYAoXw2fdavLDdOP32aPXqNxS3Wx/m6R7f4S
aKsmm6Y30M/2vX0x6MNp+UAgkONDeLP4+lI0pm2icrxDJxANBA==
X-Google-Smtp-Source: ABdhPJxJ2RkeI2wDbrioDp+TAM0DLZHMQtcB2cXpoa7Vc5jxGMyeF8vL86TXO8CG8ZFioO4BuYjAqn7jB2kOL7ivFCs=
X-Received: by 2002:a92:c5c2:: with SMTP id s2mr17341367ilt.180.1627399850865;
Tue, 27 Jul 2021 08:30:50 -0700 (PDT)
In-Reply-To: <CANc-5Ux71DBhP2_sBZy69fhTefcM0t+gYosebdqjVx_Q=RYbqg@mail.gmail.com>
X-BeenThere: python-list@python.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: General discussion list for the Python programming language
<python-list.python.org>
List-Unsubscribe: <https://mail.python.org/mailman/options/python-list>,
<mailto:python-list-request@python.org?subject=unsubscribe>
List-Archive: <https://mail.python.org/pipermail/python-list/>
List-Post: <mailto:python-list@python.org>
List-Help: <mailto:python-list-request@python.org?subject=help>
List-Subscribe: <https://mail.python.org/mailman/listinfo/python-list>,
<mailto:python-list-request@python.org?subject=subscribe>
X-Mailman-Original-Message-ID: <CAPTjJmqT4e3mob+mYitA2J7ZfLTvSqXeDQvsaDgfEAZOi=PU0Q@mail.gmail.com>
X-Mailman-Original-References: <CANc-5Ux71DBhP2_sBZy69fhTefcM0t+gYosebdqjVx_Q=RYbqg@mail.gmail.com>
 by: Chris Angelico - Tue, 27 Jul 2021 15:30 UTC

On Wed, Jul 28, 2021 at 1:05 AM Skip Montanaro <skip.montanaro@gmail.com> wrote:
>
> I have a development branch in my fork of python/cpython, the
> register2 branch of https://github.com/smontanaro/cpython. As I am
> dealing with virtual machine internals I've found the changes to the
> virtual machine between 3.9 and 3.10 too disruptive. I'd like to track
> 3.9 instead. How would I go about making the switch while minimizing
> the number of (inevitable) conflicts? I was thinking of diffing my
> current state against 3.10, then creating a new branch off 3.9 and
> applying the diff to that. That makes most of the effort outside of
> the view of git though, and won't necessarily minimize conflicts. Is
> there some way to do this totally within the git infrastructure?
>

If your changes (on top of 3.10) aren't too invasive, you could rebase
those changes on top of 3.9, or cherry-pick them one by one. That
would be a more granular way to "diff [your] current state against
3.10" (assuming you've been making those changes as individual
commits).

Check out the "rebase --onto" operation:

https://git-scm.com/docs/git-rebase

The first example of --onto (regarding master/next/topic branches) is
what I think you're trying to do.

ChrisA

1
server_pubkey.txt

rocksolid light 0.9.81
clearnet tor