From nobody Sat Dec 03 18:15:14 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPdJt3z1Fz4j2nw for ; Sat, 3 Dec 2022 18:15:26 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPdJt27rbz49vd for ; Sat, 3 Dec 2022 18:15:26 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670091326; h=from:from: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; bh=MECD+q8C2rhlmt3SGGrt9ZHOLR7oj0EqY3i15pupaCA=; b=c4CDpcbmrN2/MhAH4QdXtfjX/Ac1hlQFe8jUf5DR4oZmNMWyybqqgnX/dlAQrXVMUjE06w FEH2KZJFUdkLhG7Xi9feAPBXRM7/bRv6yCnjSvMMGVymjNIsKWxB/9CjRiGkLcrL0cBdaH sPBTKMcKxMjNQzeVZGXA0M84jE7WI8bwtPEuWwpjYUg/bRYTrZ1NimUorZuZvHUZJHM2vq FKkmcDqvbrzR030pjkMibzN581Hdcz838yjbkbG9Nil9nJd9g381JcBnxq9chVn6/DFUl4 LLoF6igfua3GYBrqsz5qc0LxUmrLhQufhV+HDFLRg9ho+u2cjg+Sz1C9Eol7Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670091326; h=from:from: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; bh=MECD+q8C2rhlmt3SGGrt9ZHOLR7oj0EqY3i15pupaCA=; b=mo9Y6QXUE1gAZJqW7cbOS4usjfL0xelUfQi9S6Vd0S+FlCKfa6uBzKmJmeluDoJJ7E/RCx fQo/1zbUomMuOrdhNwzH9Fxh+KD4UoXezF+BfIDu4g1HTR5E/U/EsNo/CdZjMjpQHUIhMr tDarFJmujXyOrKOw8rIcpeiierlFRRZx4/PjXNZI6wwqp1abe89XJlhmLqnA/eFApGKU3U DTyc6Axknvyejsm8xShLkDcQ4WvLG+54P8uWD5RebpOTjfZmBpg8F4XQ+g6CXPopw8NWvn NaH8sVoC8lcO7ycr0AKDy/F0VQXOLXGg+fc8lB0E9dhJ5Ox43/YzI7ZbLvrvLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670091326; a=rsa-sha256; cv=none; b=vJM6drxYDV6zqsVyYcyxf228imneSake0hWNoq5pf5rrmZkzIohC8/cd+du46i+V+Ju+ZF XHWRliMpRlkrXmwcSnxFtgmkEk6rtBFPXnFkYoM9+qbvKNse3qiUFbTCPl3X3J3f1m2vVw YVg8sl6cmHFB5bjTtobbbefoYrhQidl0jgkaTUlbS5oCRZSFC1iOHBfG9gj9DT6AjCFaiU MJ4fefyrzKE8StFN5bmoM7446Hm3mLnY4yZG+/q44XIpeQfeBBGXvbbDG5+hydO7gfAcIF yZ4bwK9dwoG4gRDySPMLseoB12jiso0B0oeTVXerC56i67zMPcUxG/tnUCbOeQ== Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NPdJt0fMnz19Gc for ; Sat, 3 Dec 2022 18:15:26 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vs1-f54.google.com with SMTP id i2so7543729vsc.1 for ; Sat, 03 Dec 2022 10:15:26 -0800 (PST) X-Gm-Message-State: ANoB5pni2pl9SiPfMxQjauBzbR+mKbItBj+qfTB0Yvs1jpeJ5xBIkiFY yWPDL98KYnTdHp30pqStnOu0P4asV8rqBtmx1hI= X-Google-Smtp-Source: AA0mqf7E8ZTQAfzf6QGDPCG0T131fN02Qo5b+N0HdDyhM+YeLNP7J5FORf/0CIz9UO79upP/wr4pUQ9OX+4O62t1GC4= X-Received: by 2002:a05:6102:3205:b0:3b0:94f7:5a10 with SMTP id r5-20020a056102320500b003b094f75a10mr19364652vsf.53.1670091325667; Sat, 03 Dec 2022 10:15:25 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Nuno Teixeira Date: Sat, 3 Dec 2022 18:15:14 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git-switch(1) then git-pull(1) To: Warner Losh Cc: d@delphij.net, freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003580e205eef0705d" X-ThisMailContainsUnwantedMimeParts: N --0000000000003580e205eef0705d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Really nice. I'm thinking on 3 trees for ports: - main (push) - 2022Qn (cherry-pick, push) - test (push to main when testing done) $ git clone https://git.freebsd.org/ports ports/main $ cd ports/main $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 $ git worktree add ../test -b main origin/main My question is how do I push a commit from 'test' to 'main'? This sugestion is because I can have several ports in testing fase on 'test' branch and choose a specific commit to push to 'main' (local branch) and then do a final push. Does this makes sense? Warner Losh escreveu no dia s=C3=A1bado, 3/12/2022 =C3=A0(= s) 16:16: > > > On Sat, Dec 3, 2022 at 8:59 AM Nuno Teixeira wrote: > >> Hello, >> >> $ git clone https://git.freebsd.org/ports ports/main >>> $ cd ports/main >>> $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 >>> >> >> So we will have ports/{main,2022Q4} and cd to main or 2022Q4 according i= f >> commit is to main or quarterly? >> >> I will try this soon because swithing from branches is not the best way >> (but I used it for about 1 year without problems). >> > > I do this for my src commits. I have 3 trees: 'head', 'stable-13' and > 'stable-12'. I have a lot of branches off of head > for work in progress that I switch between all the time to refine, finish > and land them. For especially large projects > I'll have a separate work tree, but usually the changes are small enough > that this works fine. I have a script that > rebases everything once and a while to keep my branches in sync. For > stable-12 I have a stable/12 branch locally > that mirrors upstream. I also have a stable/mfc12 branche that I > 'insta-MFC' changes that I commit to head that need > time to cook before being pushed. I do this so I don't lose things. I the= n > rebase the stable/mfc12 onto stable/12 and push > when the time comes (doing the rebase dance as needed). > > Warner > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000003580e205eef0705d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Really nice.

I'm thinking on 3 trees for ports:

- main (p= ush)
- 2022Qn (cherry-pick, push)
- test (push to m= ain when testing done)

$ git clone https://git= .freebsd.org/ports ports/main
$ cd ports/main
$= git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4
$ git worktre= e add ../test -b main origin/main

My question is h= ow do I push a commit from 'test' to 'main'?

=
This sugestion is because I can have several ports in testing fa= se on 'test' branch and choose a specific commit to push to 'ma= in' (local branch) and then do a final push.

D= oes this makes sense?






Warner Losh <imp@bsdimp.com> escreveu no dia s=C3=A1bado, 3/12/2022 =C3=A0(= s) 16:16:


On Sat, Dec 3, 2022 at 8:59 AM Nuno Teixeir= a <eduardo@free= bsd.org> wrote:
Hello,

$ git clone https://git.freebsd.org/ports ports/main
$ cd ports/main
$ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4

So we will have ports/{main,2022Q4} and cd to m= ain or 2022Q4 according if commit is to main or quarterly?

I will try this soon because swithing from branches is not the bes= t way (but I used it for about 1 year without problems).
<= /blockquote>

I do this for my src commits. I have 3 tree= s: 'head', 'stable-13' and 'stable-12'. I have a lo= t of branches off of head
for work in progress that I switch betw= een all the time to refine, finish=C2=A0 and land them. For especially=C2= =A0large projects
I'll have a separate work tree, but usually= the changes are small enough that this works fine. I have a script that
rebases everything once and a while to keep my branches in sync. Fo= r stable-12 I have a stable/12 branch locally
that mirrors upstre= am. I also have a stable/mfc12 branche that I 'insta-MFC' changes t= hat I commit to head that need
time to cook before being pushed. = I do this so I don't lose things. I then rebase the stable/mfc12 onto s= table/12 and push
when the time comes (doing the rebase dance as = needed).

Warner


--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000003580e205eef0705d--