From owner-dev-commits-src-main@freebsd.org Wed Dec 30 10:06:58 2020 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9CA294BDD5D; Wed, 30 Dec 2020 10:06:58 +0000 (UTC) (envelope-from emss.mail@gmail.com) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5Rlj6kCYz4tC6; Wed, 30 Dec 2020 10:06:57 +0000 (UTC) (envelope-from emss.mail@gmail.com) Received: by mail-wr1-x432.google.com with SMTP id t30so17024169wrb.0; Wed, 30 Dec 2020 02:06:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-transfer-encoding; bh=D0FejF7hSyKHCtwLlmQZh5YvcPb5uQGjuJx1D2hJqWI=; b=Awn31G/ivY+VEUywEHIJa9NBKhlMugANwqwpkPzq6Fs4JQBarkwvNNfheeyQOfprSq uQMhmDHbFjgrPuS4G1mUpLK+ovhDNqmX65K/p1SJoVj7a/TNmt1Unftd556Pke4tcO8T I/TRi69ddO6LxwtGTGu+qiIjBo4HDCCf8QrJJX6qAlV1ynItN//29yNvGDporYYAdKSA fMfiwsBaHoIzcrOZMhBPsE3uGHgcCqKUKGcM29a6Si2u451FKpnpesOOPbaNjzQd9AP3 +KrVW28Wf0O5vrvqF1l0+iXA8ahTwPrUayM+ToRDZ7dCQtFhF6FIM0bW+tJNGVguuuJL Mv5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version:content-transfer-encoding; bh=D0FejF7hSyKHCtwLlmQZh5YvcPb5uQGjuJx1D2hJqWI=; b=DQnOGzRnRTuo8X68lGnE2jRlDxyO5L2CKI3nAqGbJekfVvo1YFHBAZ9W7aZHXok5km j7rv/knDfi4pEC3J7yw+ocIAL1gOUBELMtSStysM9BJ+SwTJ0bubRpEO3m+Ojl1wHOmp hcMmrscOlCF8aaT69Fmk5/1ZACocWdsIyr9zLfw0226faRBfe72zoookLaC1yrgrphPE LsQYnv0+UqntQRnvSY6ZmQFY67AYO/7F97B6LI9MIPRn7qyzIMz8qKvoVT6RKCURTgYe h/OQjTZ8ibvLZMYAUudYhWMCJblekE4z0e+xy+LXuQGKGrIRGp37XI94e13f0xrkQKn7 Jy3A== X-Gm-Message-State: AOAM531bSiIDEUKi4KcklszE0EYlDfHq9sdB4y5b8mMrDUxZiP1wNgnv ezI0aHkSe+M+MXBLxIokMfCrXC1OGxdwjg== X-Google-Smtp-Source: ABdhPJwNarMVKZInZGHrMmiq8VxpVpzYkoC6uAKptw1yHni/elcSnLrQBx6UrBv/UMDJG1ngg/HYWg== X-Received: by 2002:a5d:4fc4:: with SMTP id h4mr57829406wrw.129.1609322815963; Wed, 30 Dec 2020 02:06:55 -0800 (PST) Received: from srvbsdfenssv.interne.associated-bears.org (lstlambert-658-1-110-48.w217-128.abo.wanadoo.fr. [217.128.200.48]) by smtp.gmail.com with ESMTPSA id f14sm51048519wre.69.2020.12.30.02.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 02:06:55 -0800 (PST) Sender: Eric Masson Received: from srvbsdfenssv.interne.associated-bears.org (localhost [127.0.0.1]) by srvbsdfenssv.interne.associated-bears.org (Postfix) with ESMTP id 6634CD22; Wed, 30 Dec 2020 11:06:54 +0100 (CET) X-Virus-Scanned: amavisd-new at interne.associated-bears.org Received: from srvbsdfenssv.interne.associated-bears.org ([127.0.0.1]) by srvbsdfenssv.interne.associated-bears.org (srvbsdfenssv.interne.associated-bears.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0HioxWailW0f; Wed, 30 Dec 2020 11:06:51 +0100 (CET) Received: by srvbsdfenssv.interne.associated-bears.org (Postfix, from userid 1001) id 96514A57; Wed, 30 Dec 2020 11:06:51 +0100 (CET) From: Eric Masson To: Alexey Dokuchaev Cc: Poul-Henning Kamp , Warner Losh , Glen Barber , Kyle Evans , "Rodney W. Grimes" , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 70e64ba44941 - main - release.sh: Update GITROOT URL In-Reply-To: <20201230090913.GA90119@FreeBSD.org> (Alexey Dokuchaev's message of "Wed, 30 Dec 2020 09:09:13 +0000") References: <202012291441.0BTEf1X9009764@gitrepo.freebsd.org> <202012300018.0BU0I7gn079533@gndrsh.dnsmgr.net> <20201230022128.GE1206@FreeBSD.org> <15826.1609318943@critter.freebsd.dk> <20201230090913.GA90119@FreeBSD.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (berkeley-unix) X-Operating-System: FreeBSD 12.2-STABLE amd64 Date: Wed, 30 Dec 2020 11:06:51 +0100 Message-ID: <864kk3fw04.fsf@srvbsdfenssv.interne.associated-bears.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D5Rlj6kCYz4tC6 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=Awn31G/i; dmarc=none; spf=pass (mx1.freebsd.org: domain of emssmail@gmail.com designates 2a00:1450:4864:20::432 as permitted sender) smtp.mailfrom=emssmail@gmail.com X-Spamd-Result: default: False [-1.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[free.fr]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_SEVEN(0.00)[9]; FORGED_SENDER(0.30)[emss@free.fr,emssmail@gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[217.128.200.48:received]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::432:from]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_COUNT_FIVE(0.00)[5]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_NEQ_ENVFROM(0.00)[emss@free.fr,emssmail@gmail.com]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[free.fr]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_SPAM_SHORT(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::432:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::432:from]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2020 10:06:58 -0000 Alexey Dokuchaev writes: Hi, > What about mergemaster -F, on a related note? Did my first build based on git checkout STABLE/12 src yesterday, F flag really helped in mergemaster stage (mergemaster -iFU), only had to merge the usual local mods. Éric