Date: Thu, 3 Jun 2021 20:28:18 -0600 From: Alan Somers <asomers@freebsd.org> To: Rick Macklem <rmacklem@uoguelph.ca> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: git MFC/cherry-pick question Message-ID: <CAOtMX2j=vM%2B4SS0Tp=n=S=epW5YG19%2Bqgx_Ly47i%2Bg9=UWJ7Jg@mail.gmail.com> In-Reply-To: <YQXPR0101MB09681229241CAD2BD91794ADDD3B9@YQXPR0101MB0968.CANPRD01.PROD.OUTLOOK.COM> References: <YQXPR0101MB09681229241CAD2BD91794ADDD3B9@YQXPR0101MB0968.CANPRD01.PROD.OUTLOOK.COM>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000007cfb1b05c3e772ab Content-Type: text/plain; charset="UTF-8" On Thu, Jun 3, 2021 at 8:13 PM Rick Macklem <rmacklem@uoguelph.ca> wrote: > Hi, > > I am trying to MFC a commit to stable/12. > The cherry-pick works, but the resultant code > is not correct and won't build. > --> I broke the build yesterday and manually > reverted the breakage. > > So, how do I do this? > > Do I have to manually edit the file after the > cherry-pick and then do something like a > git commit -a > to get the edited change in, or is there a > way to tell it to add it to the cherry-pick or ?? > > Thanks anyone, for help with this, rick > Is the resulting code incorrect because of a git merge error, or because stable/13 requires slightly different code than main? If it's the latter, then after the "git cherry-pick", you should edit the file manually and do a "git commit -a --amend". That will produce the right result. You don't have to worry about screwing up merge history by using "--amend", because "git cherry-pick" already screws up merge history. If your problem is the former, then the same solution will work, although you might be able to solve it by using some fancy git merge options instead. -Alan --0000000000007cfb1b05c3e772ab--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOtMX2j=vM%2B4SS0Tp=n=S=epW5YG19%2Bqgx_Ly47i%2Bg9=UWJ7Jg>