From owner-freebsd-current@freebsd.org Fri Dec 18 16:31:51 2020 Return-Path: Delivered-To: freebsd-current@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 347FE4BD31F for ; Fri, 18 Dec 2020 16:31:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 4CyDsK6PH1z4sMr for ; Fri, 18 Dec 2020 16:31:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72f.google.com with SMTP id z11so2499190qkj.7 for ; Fri, 18 Dec 2020 08:31:49 -0800 (PST) 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:cc; bh=nmjtgX5LBjS7NNmb+TaWsD/njB8PctMxSj6usjS7t/I=; b=KMQWRPNjRBprqnD2oIAbBKj6ipS3H+7TSwX4M82HWBHV0LfAsp6PA90MA+ZiLpDKim 8eQwgerEvYjeOgQe1glYXONxJpYbTDdNKXR6XpHgJzLX2CNooF5iln1Ky056aRKAP26e uax2Jz2FyENF0PRkt44/vClz1QUl5p3eo7IOjAlUG4vtK4iNoFETbP4JdRfw4+OtNGi4 2mGpHewD4xoGRtgKCzqhn8hyrKEDtcQ5oAkhRd9zIjDr3UNDONXfYJDMll8Bbpz0AeKL d1Jgd2fmi+UlEmBZKOy86TNKBl91B5jiFId0m4pCWw2vMSPrEK4w0OPrnQtboat6gNA5 7OEw== X-Gm-Message-State: AOAM531ZV15HXAojCzneCJvgizOcTMkjEHYr0JCseZykrgOLVIo/MG11 LV9H+RrJbc1pPDFBOOZ1N+t4Wzd4x0zZY8aHFy90STvtS2FHnA== X-Google-Smtp-Source: ABdhPJy2yLBYLQcbnX1nW/n33719PPxl0DJyC7e00buaiH42qWrwfiwCQN0SB4AumRShn+gN5wMyx/xckm9eYcIPArE= X-Received: by 2002:a37:a614:: with SMTP id p20mr5307227qke.359.1608309108914; Fri, 18 Dec 2020 08:31:48 -0800 (PST) MIME-Version: 1.0 References: <20201125055425.01AA628417@elsa.codelab.cz> <10f7b800-b015-2a80-b741-4f7db03bf6eb@quip.cz> In-Reply-To: From: Warner Losh Date: Fri, 18 Dec 2020 09:31:40 -0700 Message-ID: Subject: Re: git tools for building in base? To: Gleb Popov Cc: FreeBSD Current X-Rspamd-Queue-Id: 4CyDsK6PH1z4sMr X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72f:from]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72f:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72f:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-current]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2020 16:31:51 -0000 On Fri, Dec 18, 2020 at 9:24 AM Gleb Popov wrote: > > > On Fri, Dec 18, 2020 at 7:50 PM Warner Losh wrote: > >> On Fri, Dec 18, 2020, 7:27 AM Guido Falsi wrote: >> >> > On 18/12/20 14:02, Miroslav Lachman wrote: >> > > On 25/11/2020 06:54, Thomas Mueller wrote: >> > > >> > >> NetBSD users face a similar problem with their upcoming switch from >> > >> cvs to hg (Mercurial). >> > > >> > > Do anybody have a link to some documents stating why FreeBSD chose Git >> > > and why NetBSD chose Mercurial? I am using both tools at $WORK, I am >> > > just curious what leads to these decisions. >> > > >> > >> > This is a draft document discussing exactly this (I'm not the author, >> > imp was) >> > >> > https://github.com/bsdimp/freebsd-git-docs/blob/main/git-why.md >> >> >> My blog >> >> http://bsdimp.blogspot.com/2020/09/freebsd-subversion-to-git-migration.html >> >> And this video I did >> https://youtu.be/uj1Ricrq0bs that starts with an old in joke... >> >> Warner >> > > I can't find anything about Mercurial in all three links. > Yes. I was answering the first question asked about FreeBSD and git... The clincher for me was that git is better supported by third party tools and has gotten quite good at 'recovery from oops' which mercurial is still lacking in both areas. I too have used both, and I had to re clone my hg tree several times, but so far have never screwed up a git repo so bad I had to reclone... The history rewriting of git is more integrated and more polished than the equivalent in hg, as are the rebase workflows which really help have a cleaner history... Warner