From owner-freebsd-git@freebsd.org Wed Apr 29 15:21:15 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 80FA22B830B for ; Wed, 29 Apr 2020 15:21:15 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 49C2KQ3tZsz4MBK; Wed, 29 Apr 2020 15:21:14 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f50.google.com with SMTP id j26so2017612ots.0; Wed, 29 Apr 2020 08:21:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=KGbcsDIP4TNTv2A/aKQbnKBOcil/wnri3/i/oRxRANo=; b=MtSJfrbQxxjPGmDHFtvuacV+dEVzsjCQNVoBZzkgDYt5Ww4ABUJcvnGCKeA6v2RNaA rzLx7SI4cyB/F/UkHmmlQ+nFF0Y4IdTcyAEbgpDLelTE+PxbgXpBpXg1uD82PkMvz7VT Jt9mDGg37XQAvznDj/JlunjaGjWzbujUNcOJjvJR4jrp/KzgP1mL2SFHvNKI61wEIh0+ tt7zQNDIpc1YJ4S3Z7uN/jx0gtWIRpTEff5oxzPoL8c+Kz8KmuXaF6cDvHwnwkPq1Tux 3KlHGl1AHD70bK1KEfdpDKAn/mp0B23IYY0Dvok8JHguWg6MuBiQHkpFnEZmejswMetP QEyw== X-Gm-Message-State: AGi0Pua3BNY8ZpA63Ra2AbllRUFGUT4vWUsn7sC+1vlcZiTSyMo2FKc8 wE4St8jEmBa6KUm2pNXIGnpdYATlTYNYOUwPGjN1Fg== X-Google-Smtp-Source: APiQypLh+d2OpyBvJI3hmGq8pjtFO6K0YeCxrnk44q04bF6RptrnBpTsMpN27mj304PeoHFUNW/5ekDW+Flvy0ydfDA= X-Received: by 2002:a9d:3a45:: with SMTP id j63mr24741734otc.71.1588173672827; Wed, 29 Apr 2020 08:21:12 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Wed, 29 Apr 2020 17:21:00 +0200 Message-ID: Subject: FreeBSD vendor branches of opensolaris vs. illumos To: mm@freebsd.org, freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49C2KQ3tZsz4MBK X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.50 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-2.22 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[50.210.85.209.rep.mailspike.net : 127.0.0.18]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; IP_SCORE(-0.22)[ip: (-0.25), ipnet: 209.85.128.0/17(-0.40), asn: 15169(-0.43), country: US(-0.05)]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[50.210.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 29 Apr 2020 15:21:15 -0000 Hey Martin as you might be aware we're working on the svn2git conversion and there are some branch copies in the SVN repo that I'd like to understand better (because we're dropping the distinction between vendor and vendor-sys). So we have e.g. these commits r238576 | mm | 2012-07-18 11:15:58 +0200 (Wed, 18 Jul 2012) | 2 lines Changed paths: D /vendor/illumos/dist Remove vendor/illumos/dist for repopulation from latest vendor/opensolaris ------------------------------------------------------------------------ r238577 | mm | 2012-07-18 11:16:47 +0200 (Wed, 18 Jul 2012) | 2 lines Changed paths: A /vendor/illumos/dist (from /vendor/opensolaris/dist:238566) Copy vendor/opensolaris/dist to vendor/illumos/dist ------------------------------------------------------------------------ Can you clarify the history with these vendors? What should the final state look like? Why was illumos imported first (r237833) and then copied-over later on (rr238577)? The way I see it (purely from what tags we have): - First there was opensolaris, we did imports and added some tags - It got renamed, we copied (instead of moved) things over to vendor/illumos - ??? So essentially, should I collapse this all into /vendor/illumos and the opensolaris vendor is obsolete? Cheers Uli