From owner-freebsd-git@freebsd.org Fri Nov 27 19:03:37 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 5D2754AEB1D for ; Fri, 27 Nov 2020 19:03:37 +0000 (UTC) (envelope-from dan@langille.org) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjPD82X70z3skx for ; Fri, 27 Nov 2020 19:03:35 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id AEBA85C0134; Fri, 27 Nov 2020 14:03:35 -0500 (EST) Received: from imap36 ([10.202.2.86]) by compute4.internal (MEProxy); Fri, 27 Nov 2020 14:03:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= mime-version:message-id:in-reply-to:references:date:from:to:cc :subject:content-type; s=fm2; bh=zDyE/MOthYWUFq/lOVO8xfvm3BPYuqT LMIheAL2+5cs=; b=gqmW+HFW0z058A/w2q2WpoQZWgB2q91wxF+54zp328MAX4M miifOKdkDDtzlmBZQq+DXVhpAAPZM7cQJt2BrpiTKJ2625OQMIKnijAjG35ilATy Gqxg/LXU3quDiiUIW62d3nE+VAEdtFsStFLMRwae1rFw25FV73bYOKKliOtn0aOr DNdYbh3jnorprk8qBMyMj53eZqEIdEJED2oCJzWI4OYp55+5spp0h7iI5LAMkPKt V1JaPL6t9469yHO4loL6TeS/SB99D1TOD+RrhuukExZmKu9HegY2+xZqRTGqDiaN URKmaZ9Z1qFJIa29xqNTaWd9XsQcVRS6NL6xmTg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=zDyE/M OthYWUFq/lOVO8xfvm3BPYuqTLMIheAL2+5cs=; b=hxYkvtt2rtuZ/wdKpBMq3g 3VopWsbt0K79T/QPqHNbUpwGL5bSSkdmwSvBs4rd8H5fHRbPesj0UiIfX+LfmRzH JQ3ZFThgX01FjermHLuxRHiDvc1NIbQQYFk58HZAPGpa+58iulGWC03wUMeF9FwR L8ftGiK2sMllBy1DivOT5D2jPTuqjvNz0JWx7LJMp2J0XQkP59JFHaPXz+G2i5ta Y2tfIIe2l02XgpNyJsJS5RuS2vX1H+VUxtdomOyCqxEDhq1eFBtQaoajjvh9TXwC bvrkcbl54Kuh33DSpueMyiHcaybXXa9I4zpiPMhQsIICKJw4e2B11SlkIwdAzOZA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudehgedguddvudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkjghffffhvffutgesrg dtreerreertdenucfhrhhomhepfdffrghnucfnrghnghhilhhlvgdfuceouggrnheslhgr nhhgihhllhgvrdhorhhgqeenucggtffrrghtthgvrhhnpeekfeeufeeihefgfedvudejhf ehffdvtefhudegfeegveffgfevtddvhfejlefftdenucffohhmrghinhepfhhrvggvsghs ugdrohhrghdpghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepuggrnheslhgrnhhgihhllhgvrdhorhhg X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 07DE4188007B; Fri, 27 Nov 2020 14:03:34 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-622-g4a97c0b-fm-20201115.001-g4a97c0b3 Mime-Version: 1.0 Message-Id: In-Reply-To: References: Date: Fri, 27 Nov 2020 14:03:14 -0500 From: "Dan Langille" To: "Warner Losh" Cc: freebsd-git@freebsd.org Subject: Re: git vs svn for vendor/bc/dist X-Rspamd-Queue-Id: 4CjPD82X70z3skx X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm2 header.b=gqmW+HFW; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=hxYkvtt2; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.28 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.04 / 15.00]; XM_UA_NO_VERSION(0.01)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.28]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.28:from]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.28:from]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.28:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm2,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; SPAMHAUS_ZRD(0.00)[66.111.4.28:from:127.0.2.255]; MANY_INVISIBLE_PARTS(0.05)[1]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_WWW(0.50)[]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain 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 19:03:37 -0000 On Fri, Nov 27, 2020, at 1:57 PM, Warner Losh wrote: > 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. >From a FreshPorts point of view, I need to be able to tell where the files are located. My usual git queries gave the 'wrong' answers. -- Dan Langille dan@langille.org