Re: what do I do when git cherry-pick works, but results are bogus?
On Wed, May 17, 2023, at 9:44 AM, Rick Macklem wrote: > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are not > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't seem to be an option > on cherry-pick that forces it into "merge failed", so you can edit/add the > file > and then "git cherry-pick --continue".) git cherry-pick --no-commit ?
Re: what do I do when git cherry-pick works, but results are bogus?
On Wed, 17 May 2023, 17:44 Rick Macklem, wrote: > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are not > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't seem to be an option > on cherry-pick that forces it into "merge failed", so you can edit/add > the file > and then "git cherry-pick --continue".) > If you're cherry-picking multiple commits then you can turn the problem into a rebase After the cherry-pick commits are created, then run git rebase -i Then change the `i` at the start of the line for the broken commit to `e` (edit) before saving the plan file
Re: what do I do when git cherry-pick works, but results are bogus?
On Wed, May 17, 2023 at 9:44 AM Rick Macklem wrote: > > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are not > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't seem to be an option > on cherry-pick that forces it into "merge failed", so you can edit/add the > file > and then "git cherry-pick --continue".) > > Thanks for any help with this, rick After a cherry-pick that doesn't give you quite what you want, edit the file until it has the correct contents, then do "git commit --amend /path/to/file".
what do I do when git cherry-pick works, but results are bogus?
So, the subject line basically says it. I do a git cherry-pick to MFC. It works, but the resultant file(s) are not correct. What do I do to fix this? (If the merge fails, then it's easy, but there doesn't seem to be an option on cherry-pick that forces it into "merge failed", so you can edit/add the file and then "git cherry-pick --continue".) Thanks for any help with this, rick
Re: git question: How do I push a cherry-pick of someone else's commit?
Mark Johnston wrote: > On Thu, Jun 09, 2022 at 07:49:53PM +, Rick Macklem wrote: > > Mark Johnston wrote: > > > > > > On Thu, Jun 09, 2022 at 07:30:47PM +, Rick Macklem wrote: > > > > I just tried to MFC a commit done to fix my commit by imp@ > > > > and it won't let be push the cherry-pick. > > > > > > > > What's the trick to doing this? > > > > > > You need to add --push-option=confirm-author to the git push invocation. > > Ok, thanks. > > > > It did try it as the message suggested: > > git push --push-option=confirm-author > > and it failed because it couldn't push refs to gitrepo. > > > > However, since you suggested it, I did: > > git push freebsd --push-option=confirm-author > > and that seemed to work. > > I'm not sure why you'd need to specify the remote if your first attempt > to push to gitrepo.freebsd.org failed, given that "freebsd" presumably > points to gitrepo anyway. I looked and, without "freebsd", it uses "https:..." instead of "ssh:...", so it is pretty obvious why it failed. Thanks for the help, rick > Hopefully I haven't screwed anything on the git repo up, Looks ok to me. :) > Thanks, rick > > > Or do I need to get Warner to do it? > > If so, it's 393b7606f9c1 in main, that needs to go into stable/13. > > > > rick > > ps: The stable/13 build will be broken until this gets resolved. > > I'll revert the MFC if it isn't fixed soon. > > >
Re: git question: How do I push a cherry-pick of someone else's commit?
On Thu, Jun 09, 2022 at 07:49:53PM +, Rick Macklem wrote: > Mark Johnston wrote: > > > > On Thu, Jun 09, 2022 at 07:30:47PM +, Rick Macklem wrote: > > > I just tried to MFC a commit done to fix my commit by imp@ > > > and it won't let be push the cherry-pick. > > > > > > What's the trick to doing this? > > > > You need to add --push-option=confirm-author to the git push invocation. > Ok, thanks. > > It did try it as the message suggested: > git push --push-option=confirm-author > and it failed because it couldn't push refs to gitrepo. > > However, since you suggested it, I did: > git push freebsd --push-option=confirm-author > and that seemed to work. I'm not sure why you'd need to specify the remote if your first attempt to push to gitrepo.freebsd.org failed, given that "freebsd" presumably points to gitrepo anyway. > Hopefully I haven't screwed anything on the git repo up, Looks ok to me. :) > Thanks, rick > > > Or do I need to get Warner to do it? > > If so, it's 393b7606f9c1 in main, that needs to go into stable/13. > > > > rick > > ps: The stable/13 build will be broken until this gets resolved. > > I'll revert the MFC if it isn't fixed soon. > > >
Re: git question: How do I push a cherry-pick of someone else's commit?
Mark Johnston wrote: > > On Thu, Jun 09, 2022 at 07:30:47PM +, Rick Macklem wrote: > > I just tried to MFC a commit done to fix my commit by imp@ > > and it won't let be push the cherry-pick. > > > > What's the trick to doing this? > > You need to add --push-option=confirm-author to the git push invocation. Ok, thanks. It did try it as the message suggested: git push --push-option=confirm-author and it failed because it couldn't push refs to gitrepo. However, since you suggested it, I did: git push freebsd --push-option=confirm-author and that seemed to work. Hopefully I haven't screwed anything on the git repo up, Thanks, rick > Or do I need to get Warner to do it? > If so, it's 393b7606f9c1 in main, that needs to go into stable/13. > > rick > ps: The stable/13 build will be broken until this gets resolved. > I'll revert the MFC if it isn't fixed soon. >
Re: git question: How do I push a cherry-pick of someone else's commit?
On Thu, Jun 09, 2022 at 07:30:47PM +, Rick Macklem wrote: > I just tried to MFC a commit done to fix my commit by imp@ > and it won't let be push the cherry-pick. > > What's the trick to doing this? You need to add --push-option=confirm-author to the git push invocation. > Or do I need to get Warner to do it? > If so, it's 393b7606f9c1 in main, that needs to go into stable/13. > > rick > ps: The stable/13 build will be broken until this gets resolved. > I'll revert the MFC if it isn't fixed soon. >
Re: git question: How do I push a cherry-pick of someone else's commit?
What is the error message? Did you try “git push -f” > On 9. Jun 2022, at 21:33, Rick Macklem wrote: > > I just tried to MFC a commit done to fix my commit by imp@ > and it won't let be push the cherry-pick. > > What's the trick to doing this? > Or do I need to get Warner to do it? > If so, it's 393b7606f9c1 in main, that needs to go into stable/13. > > rick > ps: The stable/13 build will be broken until this gets resolved. > I'll revert the MFC if it isn't fixed soon. >
git question: How do I push a cherry-pick of someone else's commit?
I just tried to MFC a commit done to fix my commit by imp@ and it won't let be push the cherry-pick. What's the trick to doing this? Or do I need to get Warner to do it? If so, it's 393b7606f9c1 in main, that needs to go into stable/13. rick ps: The stable/13 build will be broken until this gets resolved. I'll revert the MFC if it isn't fixed soon.
Re: git MFC/cherry-pick question
On Thu, Jun 3, 2021 at 8:29 PM Alan Somers wrote: > On Thu, Jun 3, 2021 at 8:13 PM Rick Macklem 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. > git cherry-pick does not screw up merge history. The hashes of the diffs are used by git to know what's been merged and what hasn't. git commit --amend to fix things up screws up this mechanism a bit. That's why we do the 'git cherry-pick -x' which records the hash as a backup. git log --cherry-pick can help find changes to merge. There's been some scripts offered to also help find things... And usually when git cherry-pick doesn't produce working code, it's because other things weren't cherry-pucked that the code depends on. Sometimes you can find the changes to cherry-pick it, other times you have to do a manual fixup. Warner
Re: git MFC/cherry-pick question
On Thu, Jun 3, 2021 at 8:13 PM Rick Macklem 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
git MFC/cherry-pick question
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
Pick
Hey Bro,
Check out this pick. It's GUARANTEED TO WIN.
FAVORITE LINE UNDERDOG
Raiders 4 Bucs
Take RAIDERS.
My source is NEVER wrong.
Get back to me when you win and have fun counting your money!!!
Take it easy.
Jeff
7441NCrV7-535ZsiU0041Pzcv0-388bKki7964GStQ7-99l43
2465lFyu0-136wohf4336xQgz7-245saYd1636Fl37èR{.nÇ+·¬zwfj)m¢f£¢·hkyàRàÂ+aº{.nÇ+·ç±×.®·§¶)í
æèw* ¶¦zË
Stock Pick of the Week
>>> STOCK PICK OF THE WEEK <<< For the week beginning Monday, 10-16-2000 Investment Snapshot - ATTP -- Affordable Telecom http://moneycentral.msn.com/scripts/webquote.dll?iPage=qd&Symbol=attp Target Price: $1.00 Current Price: $.20 Take a close look at this stock, it's going to rise fast! Monday it was $.12...It's jumping each day HOUSTON--(BUSINESS WIRE)--Oct. 3, 2000--Affordable Telecommunications Technology Corporation (OTC BB:ATTP) announced today its preliminary third quarter revenues will exceed expectations. Affordable Telecommunications announced preliminary projected revenues of $500,000 for the quarter ending September 30, 2000. Steven H. Bethke, president of Affordable Telecommunications, said, "We are extremely pleased to anticipate a 460% year-over-year increase in revenues, which exceed our expectations. Strong revenue gains indicate we are on track in building our revenue base through strategic marketing arrangements with leaders in the wireless industry." The Company expects to report its finalized quarterly results on or before November 15, 2000. To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Stock Pick of the Week
>>> STOCK PICK OF THE WEEK <<< For the week beginning Monday, 10-16-2000 Investment Snapshot - ATTP -- Affordable Telecom http://moneycentral.msn.com/scripts/webquote.dll?iPage=qd&Symbol=attp Target Price: $1.00 Current Price: $.12 Take a close look at this stock, it's going to rise fast! HOUSTON--(BUSINESS WIRE)--Oct. 3, 2000--Affordable Telecommunications Technology Corporation (OTC BB:ATTP) announced today its preliminary third quarter revenues will exceed expectations. Affordable Telecommunications announced preliminary projected revenues of $500,000 for the quarter ending September 30, 2000. Steven H. Bethke, president of Affordable Telecommunications, said, "We are extremely pleased to anticipate a 460% year-over-year increase in revenues, which exceed our expectations. Strong revenue gains indicate we are on track in building our revenue base through strategic marketing arrangements with leaders in the wireless industry." The Company expects to report its finalized quarterly results on or before November 15, 2000. To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
