From owner-freebsd-git@freebsd.org Mon Jan 4 17:27:22 2021 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 07E2C4DD768 for ; Mon, 4 Jan 2021 17:27:22 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-20.consmr.mail.gq1.yahoo.com (sonic306-20.consmr.mail.gq1.yahoo.com [98.137.68.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8jHX6CZ0z3Lmt for ; Mon, 4 Jan 2021 17:27:20 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1609781239; bh=tGO/tngWWUrTMrllc6+6WQMns48/jNk2ff8ffSarxue=; h=Subject:From:Date:To:From:Subject; b=qcDifEEt3EZB9UvHGShKZL3JNJK0zE6nTu5P5iuxHIf4cVkpPDYWS4l4e9gWHRXSktbDn+uHniXe8/GSMjlBwjRADBQiIgL1olHfp6QkwsMg2dnnUoGfr4gGlNOXiOpUWIe1dxG9ncqmDiXinlY1rJgFCgbGg6qjTBQwMaejK9AH0f3iIFC0w2qbn/n9KuV9h3pfaWCIOZaHvz3b542QlC3gmQQ34S5vpajLBbB0louCfyPxg0UU/cQlnDRU9Xvn77k9D6fQAcCwtyk5/Kf9f9qJKBVw9YyiujCv/DCGYT4kcigxcv3VmjY9rOk7RVoOt+j93usCiWbjquy7bVp5BA== X-YMail-OSG: zE3FipAVM1nE5Sq4qCCHicpqmsmf23_Ced3uWkWmO1_oQqejQ9l.XXVZysC0_mb 4IjC1A2lnuzwkoS0k0jWfOy4_8aveda0PAGV7HLQhavesiEnytzXmsZtz.dlkwMfSF6.1nLVSdfs h4VquV6eFcnlAbmpCZ872E16r.MsaspEhxaqo2QsvcestLX.jfwH5IgHYdI9FNkq2UTtMQhUeSh5 315qDiWtLp0vdrzaPTSQNMNJCtREgp40XHaZFRug7h8UxcQnmzJ.45v4ZprH0P42_Ucsecat3SNO bVB4MNeNNPL3S8qs_pBI6HG6CIa6ksVPH8zOqXt02NJm8IBseUFlgvccsFgku41CIbfkDtSlysoe 76FmW9W6bUVt5rXlKyX3GnP1BDwjHAVNriQRBNOww08aRDVZt3Nz9c6WAJ7huY2NgTRbTL8MLeVg k8KCLCs987Sfvp8BLT1WIdH54rqnefzEprY5.jHcOWgv54ipCMpIXFb5Gz07cHO4RIsYZM4ecXSu rSINJyKy9FOThcA9zN6VsDHMz5ITz6jhvvk1OBF.wCvFVPP.NdleWw_gasIGB6lN2_EuaDwYhVjW ESQuHaczcccc_uiQsKj0uhdQG5wl6P2LOBK0pk2CJncI_1uDIyR8ZXKcwgVciU6ldqeIwPlv.gXP PmfIBsK.BQR_OGnCsM7dmPnm_oApOwUgDTkesFTVpE5TowRJA84_xdyr5qoadxc7HVyPX1PRtHvS wx_pnBoyUII8rHGgAZZ39rOkPZ.VlUMxt.HxEgTn1HJnjVwN2R1_5SAskJG8fuYMb0be.Nq2AHgj IGepsEO3qX1NfI8p9qlNZ11QKG3DvoJI3WnDc9SdysW5S_ap64HkNiN7VttUwPNotKtpMcWKi.pa bLpDiUAn4JLKXknKE4Ns0R3jV1Kf.aYTET.iHvZ3nLUa6x0lyqELRb8jVaxltrBnJxLuvJ8r5.xq o5aCTCrneDi..Q5DYknwnOxZnYN1xgIQ19PAw4AA1pELSs5LNlj7fTGy5Bizx_8PVCL1v_UOWbrb XIV5BHhR30fqR7CQqTPOOAu18rOiR1_OSIPgyXyYyk_2cmv2S1IY2YRSNvq56aP8LFCuXhd3Qskk mbpTOraFq4RHKIF.NrJ3GA540cM5VTxiZgdYpaaPT_KvIh7Fth_KCuAkyJWeoIrRoGBMZWKVoSSL kBpHnQmlkT5gALRGeu9QSy2SSUzBTnB5jSTbj0gz2CEsyslU7ZUOmffFBftResixqYQc2apo66yp bZQ04w0ShFTtl9FAM4GIZBHd2ds.6rTVDAaS05N_nyPg1zbXXpurelRthfghV2QG7bQjTLT3i9GV h1IIHV9zVlZp4iSiDfv1upxuMrYxY4a9e_UnVPpfDMZkKYRn3OPwRLViE0EXU0LUYefrZVNIIVVX wkayAhoTszlcLN_r4nKBsZ.QgwHJ1eY8717CNmsFOHIWRZFzwXLv9YYZQ0gpDbOTsy3BLH9Orm7V ALDw1zPMht7kJXVnTlye.kT.CjeAvec0XmHwptAo07FCIdwdmQn0pr0X5Eu9tQDMezesze6odnlP Tti.T1xZKJKq66dv.FkEgEkw9.W6FTESa14zIxekV8cMm2_aKZ7LXuhi4ije_YbSleYKzYksF.ps Gbpo4xr08382TFpS2ZtCANgyZ.sJSUCRzuXoXcwYC_48Bnj5JRHqHonr7npQhkp1SJeh8SmTi07M .giGXO_19Zxx.MBZZQBRMI6.qpn7wuXwUGDRvm97vDGFvH3_FPnZMMw.5LSJYrruxt5Qc5A_8NGT Udejj9Kx7HDwiPlZkcBuhm07NY5uDvex6ceLskLCSadG8qZ0sMqbGsvVaXtj2bhwvEyInVHSY1rv oVuh7fGmnNaEPA3D2uINFPArMfEAtDlwUuQ9mpipzODattVmbCwjJcyLxks2ljVOqYdIPqm0dcn. wFq2C5HcpvDBaElZSuQqEtuXaa7AL.CDJ8xQF6xnqsl9kt7tY4nNtwXpWrKJBnqjnHgqPuQFOYiY 6rbjvGglVpGWQnkfBE_B3a6012XxpJO8hpXtlaWBGdJ9JZw1AF9BVSEDLZWXxYzWjxK_Dm.9XYkJ RCkuzQYI_qgZyTuWFqdi8vAAGezvDWQtUb5DPys5K7cFR86aqmbZf1nFCcI3U0m3SWEUZtxPD7Op KMVQNqv_faOmXMFoJqlMEvNSTMpBiAuFfQ2D102claZSJRvi32iOzxpB_Y8P64YH2a_68e4OYzHf Ze_dXAnh6aCUlk4ZL442wFjMsps8tbPeIZdlodA9wm5xKtX07UkMUnP9Gt.CKX9rL4hFMWwZef.m t13xUyH63TNNR90pDB.jgtZNcthG8wVOVhZ29x4EU82wbwe0n9pUIKBxsVV5Yz4I5uxtAoiObFvR _uFiDcb8jQW0pkZmeNKO6wZtFyDUY7AVSLnJ8jT4UClj1L6c0z82AUrsU6y5VBoNSCBMEfPVvweW YKPAvA5EgVF0e4KauAXNSMrCCmzGLF6HAQDIdddYbiP9ypX9X5kFiHU6Pc9Rd6.0xFeTGJy4DNPQ gH3MaopJ2qSjg5bEwFArcLp42lWlrIoq2NketrZuKhMC_BFD7GLsi5cpHOJTVp6Lpy3XJyX0- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Mon, 4 Jan 2021 17:27:19 +0000 Received: by smtp416.mail.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 7e3cbfb90d188c3745d98e5cc798c3a7; Mon, 04 Jan 2021 17:27:12 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: Reporting context with list submittals for defects when local git branches are involved: needs a new description? From: Mark Millard In-Reply-To: Date: Mon, 4 Jan 2021 09:27:10 -0800 Cc: Mark Millard via freebsd-git Content-Transfer-Encoding: quoted-printable Message-Id: References: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D.ref@yahoo.com> <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> <29E9AA04-C66B-4298-B84D-6549A88C038B@yahoo.com> To: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4D8jHX6CZ0z3Lmt X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.68.83:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; SUBJECT_ENDS_QUESTION(1.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.68.83:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.83:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.83:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] 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: Mon, 04 Jan 2021 17:27:22 -0000 On 2021-Jan-4, at 08:28, Ulrich Sp=C3=B6rlein = wrote: > On Mon, 2021-01-04 at 01:41:29 -0800, Mark Millard via freebsd-git = wrote: >>=20 >> On 2021-Jan-4, at 00:39, Ryan Libby wrote: >>=20 >>> On Sun, Jan 3, 2021 at 7:23 PM Mark Millard via freebsd-git >>> wrote: >>>>=20 >>>> I use a main context here to provide an example of the >>>> issue. I'm not claiming main is the only context with >>>> the issue. >>>>=20 >>>> Taking an extremely simple case where I'm targeting the >>>> head of what git fetch freebsd provided, with my local >>>> patches (re)applied via rebase: >>>>=20 >>>> # git reflog >>>> c9819aa7b91c (HEAD -> mm-src) HEAD@{0}: rebase (finish): returning = to refs/heads/mm-src >>>> c9819aa7b91c (HEAD -> mm-src) HEAD@{1}: rebase (pick): mm-src = snapshot for mm's patched build in git context. >>>> d03fd8ede2c4 (freebsd/main, freebsd/HEAD, main) HEAD@{2}: rebase = (start): checkout d03fd8ede2c4 >>>> . . . >>>>=20 >>>> One could imagine that I'd picked to work from something >>>> older than d03fd8ede2c4 (say to avoid a known problem). >>>> Either way, uname returns the likes of: >>>>=20 >>>> # uname -apKU >>>> FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT = mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 amd64 1300133 1300133 >>>>=20 >>>> (I've been experimenting with reproducible builds but that >>>> does not change the point: The identification ends up being >>>> specific to my local branch, other than the 1300133's.) >>>>=20 >>>> Thus it appears that the: >>>>=20 >>>> # freebsd-version ; uname -a >>>> 13.0-CURRENT >>>> FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT = mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 >>>>=20 >>>> historically used is not sufficient when local branches are >>>> involved. >>>>=20 >>>> It looks like something like the partial git reflog showing a >>>> relationship to a freebsd/main or freebsd/HEAD commit is >>>> effectively required, or at least some wording like a "based on >>>> freebsd/main d03fd8ede2c4" is required and no tool currently, >>>> directly provides appropriate information: it is a manual >>>> operation. >>>>=20 >>>> Food for thought. >>>>=20 >>>> . . . >>>>=20 >>>> _______________________________________________ >>>> freebsd-git@freebsd.org mailing list >>>> https://lists.freebsd.org/mailman/listinfo/freebsd-git >>>> To unsubscribe, send any mail to = "freebsd-git-unsubscribe@freebsd.org" >>>=20 >>> Does this show what you expect? >>> git log --oneline --parents freebsd/main..c9819aa7b91c >>>=20 >>> Or for just the "merge base" commit: >>> git merge-base freebsd/main c9819aa7b91c >>>=20 >>> Yes, we should document something like that for filing bugs. >>>=20 >>=20 >> Avoiding the manual lookup and typing of c9819aa7b91c : >>=20 >> # git log --oneline --parents freebsd/main..mm-src >> c9819aa7b91c d03fd8ede2c4 (HEAD -> mm-src) mm-src snapshot for mm's = patched build in git context. >>=20 >> # git merge-base freebsd/main mm-src >> d03fd8ede2c493d0c5a74b625a93a48e018515e1 >>=20 >> The first automatically identifies the commit in my mm-src >> branch, even if mm-src later gets a new HEAD. Having such >> recorded in a problem report could be important for the >> originator of the report (but possibly no one else). >>=20 >> Cool. Thanks. >>=20 >> Showing a more complicated example that also involved >> reverting a couple of commits so that the loader would >> display on a amd64 machine (a default text mode context): >>=20 >> # git log --oneline --parents = freebsd/main..mm-src-2021-01-02.avoid_framebuffer_console_change >> 2c557eeab90c ff4c62fe5612 = (mm-src-2021-01-02.avoid_framebuffer_console_change) Revert "loader: = implement framebuffer console" >> ff4c62fe5612 33700671c435 Revert "loader: fix build on non-x86 = platforms" >> 33700671c435 486580c44ce2 mm-src snapshot taretting just after = conversion to git. >>=20 >> # git merge-base freebsd/main = mm-src-2021-01-02.avoid_framebuffer_console_change >> 486580c44ce29c1e3b1d9b858a08d9df9428b699 >>=20 >> Here only the last line of the "git log --oneline --parents" has an >> identification as a freebsd/main commit hash and only the first line >> has the long-branch-name's "at the time" HEAD identifying hash. But >> knowing about the reverts could still be important information. >>=20 >> Adding a named branch that would not get its history rewritten >> to go with the defect report might be important. So in the mm-src >> example context earlier, I might not actually use mm-src directly >> but first create a mm-src.defect-description branch from mm-src >> instead and then report via mm-src.defect-description . (More >> to think about.) >>=20 >> (I've been doing things mostly to experiment.) >=20 > I'm a bit confused as to what you are asking here, tbh. Are you = working on a branch of your own? In that case, a bug report needs to = have some concrete pointers to what you've changed locally, or you need = to revert to a clean tree or something. Old PowerMacs do not work sufficiently based on pure FreeBSD. But my workarounds are genrally not sufficient for committing either. (powerpc is the primary context that lead to me having some patches. I'll use it for illustration.) Many problems have nothing to do with what I've patched. When I can, I instead report based on instead using artifact.ci.freebsd.org material and its behavior, but some bugs do not show up in debug builds or the PowerMac support problems make this not work. In complicated cases that allowed it, I've reported both from using artifact.ci.freebsd.org material and from using my patched context, in part demonstrating that a problem exists in both but providing additional evidence. > Or do you just want to have some minor things modified on your tree? That would probably be a reasonable view of my patches accumulated over the years, patches that I bring forward as I go. Adding a new one is fairly rare. > In that case, maybe using git stash and git rebase --autostash would = suit you better? A possibility, but I'm exploring alternatives. git is likely to lead to more people having local branches involved in how they choose to = operate. That in turn may lead to more reports based on such contexts. My = exploring may be an early warning. > Stuffing ever more information into the uname output or version string = isn't helpful, I did not ask for changes to uname or the version string. I just = reported a type of context for which some other technique seemed to be needed. It may be that FreeBSD will ask folks to not report based on such local-branch contexts, that is not for me to say. So far the "git log --oneline --parents freebsd/main..BRANCH" suggestion by Ryan Libby seems to cover what I was wondering about, including being fairly automatic, at least if it ends up being viewed as an acceptable procedure. > because as soon as you're 1 commit away from mainline, who knows what = crazy stuff has happened in your tree? I understand this risk but the powerpc list has been dealing with my patched-based context for years and some of what I've done has had some variant committed to address some of the PowerMac handling oddities, including one for avoiding frequent boot crashes on G5s, the most significant behavior improvement adopted from my patch efforts. In reality, even when I had local source changes never put in svn or = such, my patches were normally involved when I was not reporting based on artifact.ci.freebsd.org materials: a "dirty" context. Having git = branches involved does not change that. I would still report based on artifact.ci.freebsd.org materials when I can. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)