From nobody Sat Dec 3 16:16:30 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 4NPZgw52WBz4jlHS for ; Sat, 3 Dec 2022 16:16:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPZgw34Zmz3wNs for ; Sat, 3 Dec 2022 16:16:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62e.google.com with SMTP id b2so18159461eja.7 for ; Sat, 03 Dec 2022 08:16:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=BTV72uQNhRac02mz/TZ0JBgmvKf0pjUx5n7lk71pq94=; b=oy+FpR1dMNiM4Bs9NtF1Kmbe+koXzCWu+fXe6KD9lq0+mqO8NXV7mJDSLJcGVRuNIo lnVpEQ+EX7U/rxPtlY5n3mP25fLkYh8fPWSmWjw7CLh20lwPsT1tvOyTOsyG5csIdMWI kU9oi3mLtg64LL2FJteBOqzJ12hTNMiUo8FqEUW00ibFOIqyApAC5YirlFLgZmXbjswM S/VFa/GTq8CiQcdcbPWNOlKBD81MOM4a56uoW53UNER/N4csLo7/IcezQd1BfbkRMk6a vSaNs3HPbxbO088IG1lw/8xBa2chGkoGdjPths6XsXlVs2Aq454KKPgdfPv4k+toZtEb mkng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc: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=BTV72uQNhRac02mz/TZ0JBgmvKf0pjUx5n7lk71pq94=; b=VMT5nyntUBzY3vkDLfyUmpSzhxyPZ970Uv/sOknWXrHnFdkUvA5L4GCCOi7fa07/Kf vm0Mq99gygpf9LatJ6MxXjd/1wOa1o/ciHxGHLaN7Q9aqvB4pA9K3FmRPePZ/yjj4SMD Hcl1qqz8Xb+SPBgCFk33VGzvQJy8ksPL0xqli1kgOeERgbBTDyXsr5sJSKHLsSpNIX9K P0aFrqoU9FLodj5Ql/58BvQmAjwRBR4jVrXY9evtJzX8hIEY4/rS9TPHqQS/ayhF0Z18 Q0OtrTHAEZzS19EortTiHtuW3NjTJ5wreqA1+5ZixEQWTRD9KMlWzSl2fZrhrHhRqRUb XlqA== X-Gm-Message-State: ANoB5pkjeZBbln2hs8o9SzdIKNyyw5w0JR2N4pJTlYoQCIQZY7X6sxYv 2LWJI6bCHaQGRU4K5OtdnHYHLYjBEKWRv1Ctyba83w== X-Google-Smtp-Source: AA0mqf51e51ZViowoJWRxMzqBZwusmrjZlpz7wi9Jr++uQHOsRB8JdrNt3Owweg/L7msMV8EcyOjjpYGkx5+s73rhK0= X-Received: by 2002:a17:906:29c3:b0:7c0:e0db:f136 with SMTP id y3-20020a17090629c300b007c0e0dbf136mr1052890eje.333.1670084201941; Sat, 03 Dec 2022 08:16:41 -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: Warner Losh Date: Sat, 3 Dec 2022 09:16:30 -0700 Message-ID: Subject: Re: git-switch(1) then git-pull(1) To: Nuno Teixeira Cc: d@delphij.net, freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000009a25c805eeeec7af" X-Rspamd-Queue-Id: 4NPZgw34Zmz3wNs X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000009a25c805eeeec7af Content-Type: text/plain; charset="UTF-8" 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 if > 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 then rebase the stable/mfc12 onto stable/12 and push when the time comes (doing the rebase dance as needed). Warner --0000000000009a25c805eeeec7af Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Dec 3, 2022 at 8:59 AM Nuno T= eixeira <eduardo@freebsd.org&= gt; 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
--0000000000009a25c805eeeec7af--