From owner-freebsd-git@freebsd.org Fri May 31 09:59:16 2019 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46AAF15B7F77 for ; Fri, 31 May 2019 09:59:16 +0000 (UTC) (envelope-from dch@skunkwerks.at) 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 D54A78B818 for ; Fri, 31 May 2019 09:59:14 +0000 (UTC) (envelope-from dch@skunkwerks.at) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 5272E21C57 for ; Fri, 31 May 2019 05:59:08 -0400 (EDT) Received: from imap6 ([10.202.2.56]) by compute7.internal (MEProxy); Fri, 31 May 2019 05:59:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skunkwerks.at; h=mime-version:message-id:date:from:to:subject:content-type :content-transfer-encoding; s=fm2; bh=LLcgSR+WIP9HEMOcWl/fu6chBd pRPTS7too52flJ07Y=; b=jKtzPc5suojCAzogtz0JIj0SFUczoNmCitEC7y3lkY MZ87Om3kEeXSCwaXuEmgfeOt2KsXYDonnW/1m339UH1nvXb0qVjbIE3uMQOxwCDw KRXrgVvmupocCIxUAHzvLFO5sSaTiF9NSqqHAW5XZQ8lMkwlffwyU+cWh+ReudJw XBs04G70hiMq1EDd85iH5uAd+lizmY9d2Bz0C0gv6KIyqvOOH2BFU5xUG33+TmpS 1ss5Cy41nM76LFklC6h2T3Zo+57qI88k1g6pVmMocuUvbEp9Bc64xKmDrrfU3Snk Ay197+hAp5Fn/rgWdct7YoIO91LfnESUn5gAdy9JG7Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=LLcgSR +WIP9HEMOcWl/fu6chBdpRPTS7too52flJ07Y=; b=IOYm6VerfA1tiP8YSOZAF/ Xqvt9vReiSOXawznWD4aMFm4gUiVeAwSghrV1/KFq2Suwl8B31RvvOkcIoU1jZ+U q7CkueEOcEpNvEO39C9ejkjYc+z/1iiD1rnaPNT2eZX7veR4vr8KNyPCnmVFIT2d ueyGhnEH6kJRJhD+GslQB1cSiFy9cfHeTU1/NiauETsxFd4SSlPmzUapsE4rjvYI qqe6HMMkvWZb7xvKKW8651geD+TsOQThm3ajQ91j0Ajnr/cAb1AF/tFAOq5DV/OO BC9APxL+j2HMDTxICp4LywU7lNkCOzWZda4eUWdQ0fuhnmlLEFsYwIv77r8WbICA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrudefuddgvdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfffhffvufgtgfesthhqre dtreerjeenucfhrhhomhepfdffrghvvgcuvehothhtlhgvhhhusggvrhdfuceouggthhes shhkuhhnkhifvghrkhhsrdgrtheqnecuffhomhgrihhnpehhrggtkhhmugdrihhonecurf grrhgrmhepmhgrihhlfhhrohhmpegutghhsehskhhunhhkfigvrhhkshdrrghtnecuvehl uhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 5FE501400A0; Fri, 31 May 2019 05:59:07 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.6-555-g49357e1-fmstable-20190528v2 Mime-Version: 1.0 Message-Id: <33d1a353-a3ee-465d-9cb7-8e31e6ccf73e@www.fastmail.com> Date: Fri, 31 May 2019 09:59:01 +0000 From: "Dave Cottlehuber" To: freebsd-git@freebsd.org Subject: a ports developer daily git workflow Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: D54A78B818 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=skunkwerks.at header.s=fm2 header.b=jKtzPc5s; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=IOYm6Ver; spf=pass (mx1.freebsd.org: domain of dch@skunkwerks.at designates 66.111.4.28 as permitted sender) smtp.mailfrom=dch@skunkwerks.at X-Spamd-Result: default: False [-6.12 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[skunkwerks.at:s=fm2,messagingengine.com:s=fm2]; XM_UA_NO_VERSION(0.01)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.28]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[skunkwerks.at]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MX_GOOD(-0.01)[cached: in2-smtp.messagingengine.com]; DKIM_TRACE(0.00)[skunkwerks.at:+,messagingengine.com:+]; NEURAL_HAM_SHORT(-0.99)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; IP_SCORE(-3.52)[ip: (-9.74), ipnet: 66.111.4.0/24(-4.67), asn: 11403(-3.15), country: US(-0.06)]; MID_RHS_WWW(0.50)[]; RCVD_IN_DNSWL_LOW(-0.10)[28.4.111.66.list.dnswl.org : 127.0.5.1] 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: Fri, 31 May 2019 09:59:16 -0000 hi everybody Below is my day-to-day workflow for dealing with ports and patches in git. While this is ports focused, I use the same approach for src but significantly less frequently. Comments welcome, and I would *love* to see similar flows for svn. Perhaps we can do a survey once we have a good number of workflows, and find out what the most used ones, and most= used features are, that we need to preserve. https://hackmd.io/s/rkQxTwCa4 Most of the discussion so far about git & svn on has been based on individual features, which will clearly never be at parity no matter what the direction of comparison, nor the confirmation bias of the individuals making their (valid) points. I=E2=80=99m interested in hearing how other people use both svn and git,= so we can compare real-world workflows, and move past the fruitless discussion= s that compare isolated features in theoretical use cases. In the example below the upstream is the =E2=80=9Cofficial unofffical=E2= =80=9D git mirror on github, but the workflow doesn=E2=80=99t require nor mandate github a= t all. This workflow has been used by a number of people who were not necessari= ly familiar with FreeBSD nor ports, to successfully maintain a custom set o= f ports and packages that ebbed and flowed as we reviewed and committed changes into the official FreeBSD ports, instead of our custom fork, and= used this tree to manage packages for a number of jails and architectures. This has worked really well in allowing us the best of both worlds - updated ports from the project and community, and custom fixes or changes when we needed something urgently to deal with security vulnerabilities or occasionally to pin a port where we needed an older version for a period of time. We also have more extensive documentation on pulling in specific patches= from FreeBSD ports when we are *not* ready to bump all the versions, but= need a single fix, but I think everybody here is already well familiar with that. A+ Dave =E2=80=94 O for a muse of fire, that would ascend the brightest heaven of inventio= n!