From owner-freebsd-git@freebsd.org Fri Nov 27 18:57:51 2020 Return-Path: Delivered-To: freebsd-git@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 5D32B4AEA95 for ; Fri, 27 Nov 2020 18:57:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 4CjP5V3RMjz3sjR for ; Fri, 27 Nov 2020 18:57:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2c.google.com with SMTP id q7so2729232qvt.12 for ; Fri, 27 Nov 2020 10:57:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=3OTJkFGsHq6XWolA3Jds/WFOBSAat47zQNL09fTmHts=; b=wfFbhgg2bcu0r9E/Uw50rJ2mNPn31L/uLPS+5indc7XtSaxoA5EtQRAdMtUyC0JdGr RTzi5TkmOLiGXPfVKxYAlWiQVjyrt5+qRtkXOgZx4hkpdquyacy6dUIgStdfxNV7MFPF hlY2LWRlI9CWPHX019sVZWVzxwyxASK8Da2FjdTyuNiDqCHnkvruZ4+eHBKLQ3kpk3vE IkYe5Uv/DKYvphJ7DAN+aYyLGh1F9UJsEesaElpcNNnO4UTX1yXL7jPXsNkCZ1zWRtgx Uwj35qiV8TJJQ+/gJ9/pEvtGtKAlPPjlDnr70nk4RWK8Gpf94SkpmfBQglZcf68YqvNM 0CCw== 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=3OTJkFGsHq6XWolA3Jds/WFOBSAat47zQNL09fTmHts=; b=XzjdNrS8d44GE3wD3qbXACTjn8hJem7IkzmUTL3/q6k/1qHFPQ+NO+fZzBonhgQ47k /h1lG2EdZCyMN04tUEw+ZJQa5CKGO6U5/4M/VoJwRPt1kVm667JkhDXNP8ZrqT52UvGy QdCGeeXyqDTyjNAt46+skp90C6MxurGo3zQEBGMWeLpH0DOeDSc+b/teV9+IIFLPc/ze madUsyjh/WgaxoryUBWIF5/nIsBRMFVKJzcfsoPHiue+cqdmyS53q3YGckHe4rkcFqbR lwzPXQxGtlqIu3OThsbxomLBGelAiXKyNk8aKrp6c9Blo4gKpOAMbn7s17Klu7pakmTw blkQ== X-Gm-Message-State: AOAM532V5oU0JnAoLOeWJvPvXkdpeXobE0F9Z5P6NGQSTsPn8ttbhUvo 65qGe51W2eP3tNZlXcHF8t1fYBtLzuKvnUodlTrw/9nrNzui8Q== X-Google-Smtp-Source: ABdhPJxTq87HBDVVNBeWlnAFyPjSztz7wIiEb8lAgPnyzI4giSiVnHHG2UVO2jiDXZmde3TZurzeIfsCUfzU7WnlSjI= X-Received: by 2002:ad4:4e13:: with SMTP id dl19mr9602374qvb.24.1606503469411; Fri, 27 Nov 2020 10:57:49 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 27 Nov 2020 11:57:38 -0700 Message-ID: Subject: Re: git vs svn for vendor/bc/dist To: Dan Langille Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4CjP5V3RMjz3sjR X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=wfFbhgg2; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2c) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.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)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f2c:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(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::f2c: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:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f2c:from]; 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-git]; 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-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Nov 2020 18:57:51 -0000 Hey Dan, On Fri, Nov 27, 2020 at 11:25 AM Dan Langille wrote: > I am trying to understand how git handled this subversion commit: > > https://svnweb.freebsd.org/base?view=revision&revision=368062 > > The file paths are vendor/bc/dist/.gitignore etc. > > On git, we have > https://github.com/freebsd/freebsd/commit/982c17586e39a3d0655b62da43a5642b69ab2af0 > > It looks to be the same list of files, but without the vendor/bc/dist/ > prefix. > > The files all seems to be in the base directory. > > Can anyone explain this for me please? Should they not have the same path? > git and svn are different in how they handle labeling interesting bits of the tree. subversion has one large tree as its name space. So all tags and branches are done in the context of that tree via copy commands. Creation / changing of tags also consumes a subversion revision. git has two name spaces, though. One for tall the files, and a separate one for tags and branches. Tags and branches are not versioned in git, so they don't create a new hash. The upshot of all this is that the vendor branch in git looks somewhat different than a vendor branch in subversion, and this is what you are seeing. After the holiday weekend, I should have the 'how to do vendor branches in git' written up and, if I did my job right, it should become more clear. Warner