Date: Thu, 7 Dec 2023 15:33:30 +0000 From: Nuno Teixeira <eduardo@freebsd.org> To: Jan Beich <jbeich@freebsd.org> Cc: FreeBSD Mailing List <freebsd-ports@freebsd.org> Subject: Re: Best practice to bump consumers portrevision on quarterly Message-ID: <CAFDf7UJpDHD1Lyz2As3sTYiw0tYBJGBjUHmwznkU%2BEbJoExtBA@mail.gmail.com> In-Reply-To: <CAFDf7UJ5FJE5OoD6u-DF0aitgBY5cDh1giCFLe190whrAEGvEg@mail.gmail.com> References: <CAFDf7UKFNP7yFDnTE0vp5-fJNUy0fkV3xUc672jauZPt4q%2B0_g@mail.gmail.com> <a5r0-5kdu-wny@FreeBSD.org> <CAFDf7UJ5FJE5OoD6u-DF0aitgBY5cDh1giCFLe190whrAEGvEg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000003acb6b060bed31e6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Jan, I can confirm that it worked fine :) https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D274405 Thanks! Nuno Teixeira <eduardo@freebsd.org> escreveu no dia segunda, 27/11/2023 =C3=A0(s) 12:55: > Hello Jan, > > I'm waiting on 9b214a66ea8788a6da299139decf506a4b4f5ff1 commit to be MFHe= d > so I can proceed with wxgtk32. > > $ git cherry-pick -x 03eac77c103b637b316d6a73df7cae01986402cf (bump > consumers commit) > $ git checkout @ . > $ xargs -n1 portedit bump-revision -i </path/to/port.list (my > consumers.list) > $ git add -u > $ git cherry-pick --continue > > I'm getting this result after `cherry-pick --continue`: > > ##### > */*: Bump consumers of x11-toolkits/wxgtk32 > > New version of wxWidgets in tree > > (cherry picked from commit 03eac77c103b637b316d6a73df7cae01986402cf) > > # Conflicts: > # databases/grass8/Makefile > # games/0ad/Makefile > # graphics/hugin/Makefile > # lang/erlang-runtime24/Makefile > # lang/erlang-runtime25/Makefile > # lang/erlang-runtime26/Makefile > # lang/erlang-wx/Makefile > # math/saga/Makefile > # security/veracrypt/Makefile > # > # It looks like you may be committing a cherry-pick. > # If this is not correct, please run > # git update-ref -d CHERRY_PICK_HEAD > # and try again. > > > # Please enter the commit message for your changes. Lines starting > # with '#' will be ignored, and an empty message aborts the commit. > # > # Date: Thu Nov 23 11:20:28 2023 +0000 > # > # On branch 2023Q4 > # Your branch is up to date with 'origin/2023Q4'. > # > # You are currently cherry-picking commit 03eac77c103b. > # > # Changes to be committed: > # modified: astro/opencpn/Makefile > # modified: astro/phd2/Makefile > # modified: audio/audacity/Makefile > # modified: audio/spek/Makefile > # modified: cad/PrusaSlicer/Makefile > <snip> > ##### > > Jan Beich <jbeich@freebsd.org> escreveu no dia domingo, 26/11/2023 =C3=A0= (s) > 20:29: > >> Nuno Teixeira <eduardo@freebsd.org> writes: >> >> > Hello, >> > >> > What is the correct way of bumping consumers in quarterly? >> > >> > 1. cherry-pick port update >> > 2. bump portrevision consumers on quarterly directly? >> >> Cherry-pick both. To overcome merge conflicts reset index and bump >> directly. The important part is to retain the commit message with >> cherry-pick annotation. >> >> $ git cherry-pick -x >> $ git checkout @ . >> $ xargs -n1 portedit bump-revision -i </path/to/port.list >> $ git add -u >> $ git cherry-pick --continue >> >> Direct commits are intended mainly when branches diverge too much. >> Ideally, those should be also annotated[1] with rationale why cherry-pic= k >> wasn't considered (PITA enough to discourage direct commits). >> >> [1] >> https://docs.freebsd.org/en/articles/committers-guide/#_considerations_w= hen_mfcing >> "Clearly mark direct commits ..." but ports/ tree is a probably >> more sloppy upholding this. >> > > > -- > Nuno Teixeira > FreeBSD Committer (ports) > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000003acb6b060bed31e6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hello Jan,</div><div><br></div><div>I can confirm tha= t it worked fine :)<br><br><a href=3D"https://bugs.freebsd.org/bugzilla/sho= w_bug.cgi?id=3D274405">https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D= 274405</a><br><br></div><div>Thanks!<br></div></div><br><div class=3D"gmail= _quote"><div dir=3D"ltr" class=3D"gmail_attr">Nuno Teixeira <<a href=3D"= mailto:eduardo@freebsd.org">eduardo@freebsd.org</a>> escreveu no dia seg= unda, 27/11/2023 =C3=A0(s) 12:55:<br></div><blockquote class=3D"gmail_quote= " style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);= padding-left:1ex"><div dir=3D"ltr"><div>Hello Jan,</div><div><br></div><div= >I'm waiting on 9b214a66ea8788a6da299139decf506a4b4f5ff1 commit to be M= FHed so I can proceed with wxgtk32.<br></div><div><br></div><div>$ git cher= ry-pick -x 03eac77c103b637b316d6a73df7cae01986402cf (bump consumers commit)= <br>$ git checkout @ .<br>$ xargs -n1 portedit bump-revision -i </path/t= o/port.list (my consumers.list)<br>$ git add -u<br>$ git cherry-pick --cont= inue</div><div><br></div><div>I'm getting this result after `cherry-pic= k --continue`:</div><div><br></div><div>#####<br></div><div>*/*: Bump consu= mers of x11-toolkits/wxgtk32<br><br>New version of wxWidgets in tree<br><br= >(cherry picked from commit 03eac77c103b637b316d6a73df7cae01986402cf)<br><b= r># Conflicts:<br># =C2=A0 =C2=A0 =C2=A0 databases/grass8/Makefile<br># =C2= =A0 =C2=A0 =C2=A0 games/0ad/Makefile<br># =C2=A0 =C2=A0 =C2=A0 graphics/hug= in/Makefile<br># =C2=A0 =C2=A0 =C2=A0 lang/erlang-runtime24/Makefile<br># = =C2=A0 =C2=A0 =C2=A0 lang/erlang-runtime25/Makefile<br># =C2=A0 =C2=A0 =C2= =A0 lang/erlang-runtime26/Makefile<br># =C2=A0 =C2=A0 =C2=A0 lang/erlang-wx= /Makefile<br># =C2=A0 =C2=A0 =C2=A0 math/saga/Makefile<br># =C2=A0 =C2=A0 = =C2=A0 security/veracrypt/Makefile<br>#<br># It looks like you may be commi= tting a cherry-pick.<br># If this is not correct, please run<br># =C2=A0 = =C2=A0 =C2=A0 git update-ref -d CHERRY_PICK_HEAD<br># and try again.<br><br= ><br># Please enter the commit message for your changes. Lines starting<br>= # with '#' will be ignored, and an empty message aborts the commit.= <br>#<br># Date: =C2=A0 =C2=A0 =C2=A0Thu Nov 23 11:20:28 2023 +0000<br>#<br= ># On branch 2023Q4<br># Your branch is up to date with 'origin/2023Q4&= #39;.<br>#<br># You are currently cherry-picking commit 03eac77c103b.<br>#<= br># Changes to be committed:<br># =C2=A0 =C2=A0 =C2=A0 modified: =C2=A0 as= tro/opencpn/Makefile<br># =C2=A0 =C2=A0 =C2=A0 modified: =C2=A0 astro/phd2/= Makefile<br># =C2=A0 =C2=A0 =C2=A0 modified: =C2=A0 audio/audacity/Makefile= <br># =C2=A0 =C2=A0 =C2=A0 modified: =C2=A0 audio/spek/Makefile<br># =C2=A0= =C2=A0 =C2=A0 modified: =C2=A0 cad/PrusaSlicer/Makefile</div><div><snip= ></div><div><div>#####</div></div></div><br><div class=3D"gmail_quote"><= div dir=3D"ltr" class=3D"gmail_attr">Jan Beich <<a href=3D"mailto:jbeich= @freebsd.org" target=3D"_blank">jbeich@freebsd.org</a>> escreveu no dia = domingo, 26/11/2023 =C3=A0(s) 20:29:<br></div><blockquote class=3D"gmail_qu= ote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,20= 4);padding-left:1ex">Nuno Teixeira <<a href=3D"mailto:eduardo@freebsd.or= g" target=3D"_blank">eduardo@freebsd.org</a>> writes:<br> <br> > Hello,<br> ><br> > What is the correct way of bumping consumers in quarterly?<br> ><br> > 1. cherry-pick port update<br> > 2. bump portrevision consumers on quarterly directly?<br> <br> Cherry-pick both. To overcome merge conflicts reset index and bump<br> directly. The important part is to retain the commit message with<br> cherry-pick annotation.<br> <br> =C2=A0 $ git cherry-pick -x<br> =C2=A0 $ git checkout @ .<br> =C2=A0 $ xargs -n1 portedit bump-revision -i </path/to/port.list<br> =C2=A0 $ git add -u<br> =C2=A0 $ git cherry-pick --continue<br> <br> Direct commits are intended mainly when branches diverge too much.<br> Ideally, those should be also annotated[1] with rationale why cherry-pick<b= r> wasn't considered (PITA enough to discourage direct commits).<br> <br> [1] <a href=3D"https://docs.freebsd.org/en/articles/committers-guide/#_cons= iderations_when_mfcing" rel=3D"noreferrer" target=3D"_blank">https://docs.f= reebsd.org/en/articles/committers-guide/#_considerations_when_mfcing</a><br= > =C2=A0 =C2=A0 "Clearly mark direct commits ..."=C2=A0 but ports/ = tree is a probably<br> =C2=A0 =C2=A0 more sloppy upholding this.<br> </blockquote></div><br clear=3D"all"><br><span class=3D"gmail_signature_pre= fix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div dir=3D"l= tr"><span style=3D"color:rgb(102,102,102)">Nuno Teixeira<br>FreeBSD Committ= er (ports)</span></div></div> </blockquote></div><br clear=3D"all"><br><span class=3D"gmail_signature_pre= fix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div dir=3D"l= tr"><span style=3D"color:rgb(102,102,102)">Nuno Teixeira<br>FreeBSD Committ= er (ports)</span></div></div> --0000000000003acb6b060bed31e6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJpDHD1Lyz2As3sTYiw0tYBJGBjUHmwznkU%2BEbJoExtBA>