From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from tb-mx0.topicbox.com (localhost.local [127.0.0.1]) by tb-mx0.topicbox.com (Postfix) with ESMTP id 848BF23C04F4 for ; Sun, 25 Aug 2024 15:03:32 -0400 (EDT) (envelope-from sommerfeld@hamachi.org) Received: from tb-mx0.topicbox.com (localhost [127.0.0.1]) by tb-mx0.topicbox.com (Authentication Milter) with ESMTP id F799BAE1B82; Sun, 25 Aug 2024 15:03:32 -0400 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=topicbox.com; s=arcseal; t= 1724612612; b=iVNZumitItzvg4oggryjSrg01WFB2trOcUf4UNIZi8O9xugb1T 3uxescilxGP09EhyvGIn4CzzESghW3TnDKyz9pT8Kp3jz9yRvO+a7UFgtGJDSTbP JG7dcwLeY2Ktd50ETGY+4rSdrvcV8RMqdq/wQxSPCi30R1SQ/FHk5Bp7WFTODa39 ESVuWjCUJdF1wksFVmZ/vRIVYNEfcVJCYHCT3ihVgP+jrBZCB6Fn4X4A3uELLpt+ 4TdJFBrEbjbTKfD+86XOzClFxr9U6IimfbopwerpPLc05PcGFZv9vCCg/0/1zFbm rBQIoiX4/Ww96t42xgXLC5TNiGaqWK/Uyuww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= topicbox.com; h=message-id:date:mime-version:to:subject:from :content-type:content-transfer-encoding; s=arcseal; t= 1724612612; bh=6fdUuR1uRwPaRTqINCKjvmxGxaQ2Ws6EmxRn5dpu9Do=; b=h oMZR2brCMb4Db9z2N5TynCPDsRrTRLxq62xLZeY42sEWDYXduQ+s4f1b1mJdbkY2 ACchcgdoaVnPG0lY7ylW/ubEfLTRsIcz9uXG0vohdlgUSHrI2kaHeJUR8xpuu6mu V4Wxi8a5ltJmYlH1akbuKI26LeNFeJXld88AcEeW+4yxnz95WyKSkGwy2FSh2b9P g48czHJaLQhKaE5yx0o5bW81+5+m4BywK/JuiiY8E5mUmF2WQOqJhuGAPdCVAt23 Nss6Q5sOUe7GMU7m054yrfBeOfLyLC9D5lI5wk8nq6zSnpBS0iThXXFOVwQiNUlL mRXrI13+UrKauQeF9fTdg== ARC-Authentication-Results: i=1; tb-mx0.topicbox.com; arc=none (no signatures found); bimi=none (No BIMI records found); dkim=pass (2048-bit rsa key sha256) header.d=hamachi.org header.i=@hamachi.org header.b=qa9Fg3vS header.a=rsa-sha256 header.s=hamachi-202408 x-bits=2048; dmarc=pass policy.published-domain-policy=reject policy.applied-disposition=none policy.evaluated-disposition=none (p=reject,d=none,d.eval=none) policy.policy-from=p header.from=hamachi.org; iprev=pass smtp.remote-ip=173.11.94.225 (the-governor.hamachi.org); spf=pass smtp.mailfrom=sommerfeld@hamachi.org smtp.helo=the-governor.hamachi.org; x-aligned-from=pass (Address match); x-me-sender=none; x-ptr=pass smtp.helo=the-governor.hamachi.org policy.ptr=the-governor.hamachi.org; x-return-mx=pass header.domain=hamachi.org policy.is_org=yes (MX Records found: the-governor.hamachi.org,smtp-backup-in.hamachi.org); x-return-mx=pass smtp.domain=hamachi.org policy.is_org=yes (MX Records found: the-governor.hamachi.org,smtp-backup-in.hamachi.org); x-tls=pass smtp.version=TLSv1.2 smtp.cipher=ECDHE-RSA-AES256-GCM-SHA384 smtp.bits=256/256; x-vs=clean score=0 state=0 Authentication-Results: tb-mx0.topicbox.com; arc=none (no signatures found); bimi=none (No BIMI records found); dkim=pass (2048-bit rsa key sha256) header.d=hamachi.org header.i=@hamachi.org header.b=qa9Fg3vS header.a=rsa-sha256 header.s=hamachi-202408 x-bits=2048; dmarc=pass policy.published-domain-policy=reject policy.applied-disposition=none policy.evaluated-disposition=none (p=reject,d=none,d.eval=none) policy.policy-from=p header.from=hamachi.org; iprev=pass smtp.remote-ip=173.11.94.225 (the-governor.hamachi.org); spf=pass smtp.mailfrom=sommerfeld@hamachi.org smtp.helo=the-governor.hamachi.org; x-aligned-from=pass (Address match); x-me-sender=none; x-ptr=pass smtp.helo=the-governor.hamachi.org policy.ptr=the-governor.hamachi.org; x-return-mx=pass header.domain=hamachi.org policy.is_org=yes (MX Records found: the-governor.hamachi.org,smtp-backup-in.hamachi.org); x-return-mx=pass smtp.domain=hamachi.org policy.is_org=yes (MX Records found: the-governor.hamachi.org,smtp-backup-in.hamachi.org); x-tls=pass smtp.version=TLSv1.2 smtp.cipher=ECDHE-RSA-AES256-GCM-SHA384 smtp.bits=256/256; x-vs=clean score=0 state=0 X-ME-VSCause: gggruggvucftvghtrhhoucdtuddrgeeftddruddviedgudefudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhepkfffgg gfvffuhfgtgfesthejredttddvjeenucfhrhhomhepuehilhhlucfuohhmmhgvrhhfvghl ugcuoehsohhmmhgvrhhfvghlugeshhgrmhgrtghhihdrohhrgheqnecuggftrfgrthhtvg hrnhepuedukeeuieeuheeiieduleekteevleeifeegudehtefhueffhfduledugfeugfeu necuffhomhgrihhnpehilhhluhhmohhsrdhorhhgnecukfhppedujeefrdduuddrleegrd dvvdehpddviedtfeemfedtvdegmegvtdehmegrsgdttdemmeefnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehinhgvthepudejfedruddurdelgedrvddvhedphhgvlh hopehthhgvqdhgohhvvghrnhhorhdrhhgrmhgrtghhihdrohhrghdpmhgrihhlfhhrohhm peeoshhomhhmvghrfhgvlhgusehhrghmrggthhhirdhorhhgqedpnhgspghrtghpthhtoh epuddprhgtphhtthhopeeouggvvhgvlhhophgvrheslhhishhtshdrihhllhhumhhoshdr ohhrgheq X-ME-VSScore: 0 X-ME-VSCategory: clean Received-SPF: pass (hamachi.org: 173.11.94.225 is authorized to use 'sommerfeld@hamachi.org' in 'mfrom' identity (mechanism 'mx' matched)) receiver=tb-mx0.topicbox.com; identity=mailfrom; envelope-from="sommerfeld@hamachi.org"; helo=the-governor.hamachi.org; client-ip=173.11.94.225 Received: from the-governor.hamachi.org (the-governor.hamachi.org [173.11.94.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tb-mx0.topicbox.com (Postfix) with ESMTPS for ; Sun, 25 Aug 2024 15:03:31 -0400 (EDT) (envelope-from sommerfeld@hamachi.org) Received: from [IPV6:2603:3024:e05:ab00::3] (hydra.hamachi.org [IPv6:2603:3024:e05:ab00::3]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sommerfeld) by the-governor.hamachi.org (Postfix) with ESMTPSA id 60B3A30B4; Sun, 25 Aug 2024 12:02:55 -0700 (PDT) Authentication-Results: the-governor.hamachi.org; auth=pass; dkim=pass (2048-bit rsa key sha256) header.d=hamachi.org header.i=@hamachi.org header.b=qa9Fg3vS header.a=rsa-sha256 header.s=hamachi-202408; x-aligned-from=pass (Address match); x-local-user=pass; x-spam=pass score=-2.00 required=5.00 X-Spam-hits: BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,NO_RECEIVED,NO_RELAYS, T_SCC_BODY_TEXT_LINE X-Spam-Status: No, score=-2.00 required=5.00 X-Spam-score: -2.00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hamachi.org; s=hamachi-202408; t=1724612575; bh=6fdUuR1uRwPaRTqINCKjvmxGxaQ2Ws6EmxRn5dpu9Do=; h=Date:To:Subject:From; b=qa9Fg3vSFhspYd4Rfdr0NpTBFzRDfcHtEGoS5BW/ZDV9IYcPtLKzzhO0lcojKGdRE mRqy/ygqhGTYmuRSDYoC1MZTsYjE/tku8HUJLYoMki4oLiWUgpM6HBRnblZ+fl9MKi CpLhEa9h/ojJzdvf8b6qDhpYQdTNoe82MnAXTanFEpSS16TnkS84cZ57TyN/l4lyEP BWFAa4viD0eKk73h+u1pDXbJhWPkniuk149v/SQpgffZf+ve1XCOKtNF1H6eozgO83 loWtxEzdn02CSsyEH80KdCkEWSwro0vdsDDwPlPb8lrCLKWcTuiAsoqiZdAJzc2pRy h3LW1VuNaDE8A== Message-ID: <4f0c8ae5-fc7b-4643-95ba-4c58c679285a@hamachi.org> Date: Sun, 25 Aug 2024 12:03:28 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: developer@lists.illumos.org Subject: [REVIEW] 16719 nightly should be able to create and update build trees from git Content-Language: en-US From: Bill Sommerfeld Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Topicbox-Policy-Reasoning: allow: sender is a member Topicbox-Message-UUID: bb83dadc-6314-11ef-af9d-b4d7fc8b7b06 Issue: https://www.illumos.org/issues/16719 CR: https://code.illumos.org/c/illumos-gate/+/3642 Diff: https://code.illumos.org/~diff/bdc184fadd01f4238ca20d4ec117160a1383574e The nightly script has long had a facility to automatically populate an initially empty build tree, and then incrementally pull changes into it. This worked with both teamware and mercurial, but when we switched from mercurial to git, no changes were made for git, because it was unclear what the right way to handle merge conflicts during the pull. For a while I've had private changes to nightly that fix this, in an admittedly opinionated way: I don't let it attempt to merge. Instead, it uses "git switch" to set the build branch to the tip of the source branch. I'd like to integrate these changes into illumos-gate so that others can use them. No change to default nightly behavior is expected as the default illumos environment file includes the 'n' option. I've updated the man page and the default environment file to match. In particular I've added a "WARNINGS" section explaining how this can potentially lead to changes getting lost or hidden if you expect it to behave like the way "bringover" used to behave. Thanks in advance for the review. - Bill