Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Manually 'Rebase with History' and Reapply #5 #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP] Manually 'Rebase with History' and Reapply #5 #7

wants to merge 3 commits into from

Conversation

RandomDSdevel
Copy link
Member

  • Have you followed the guidelines in our Contributing document?

  • Have you checked to ensure there aren't other open Pull Requests for the same change?

  • Have you added an explanation of what your changes do and why you'd like us to include them? (Yes, in my commit messages.)

  • Have you written new tests for your changes? Here's an example.

  • Have you successfully run 'brew style' with your changes locally?

    (I may do this later, but, since it isn't yet possible to run 'brew style' using our copy of 'brew,' this would entail me pushing copies my commits over to my local copy of upstream's repository, running 'brew style,' then applying any recommendations in this temporary local upstream branch and pushing them back over to this branch.)

  • Have you successfully run 'brew tests' with your changes locally?

    (I may do this later, but, since it isn't yet possible to run 'brew tests' using our copy of 'brew,' this would entail me pushing copies my commits over to my local copy of upstream's repository, running 'brew style,' then applying any recommendations in this temporary local upstream branch and pushing them back over to this branch.)

  • Have you successfully run 'brew man' locally and committed any changes?

     Adapts #5 to account for upstream changes in argument parsing. (Don't worry, this PR won't stay nearly as big once I've publicly rebased our other branches on top of upstream.)

@RandomDSdevel RandomDSdevel mentioned this pull request Nov 4, 2020
Open
3 tasks
@RandomDSdevel RandomDSdevel marked this pull request as ready for review November 4, 2020 01:12
@RandomDSdevel
Copy link
Member Author

@portage-brew/core-collaborators:

     This is now ready to review.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 595b85a to b28be80 Compare November 13, 2020 01:23
@RandomDSdevel
Copy link
Member Author

     Rebased on top of upstream release v2.5.10.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from b28be80 to 322c339 Compare November 13, 2020 02:51
@RandomDSdevel
Copy link
Member Author

     So I realized that my last rebase attempt actually dropped my changes on the floor. I've recovered them from my reflog now. Apparently 'git rebase -i --rebase=merges' doesn't like it when you stuck new changes into a merge commit, preferring empty merge commits. I thus split the relevant changes out into their own commit.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 322c339 to 46145eb Compare November 17, 2020 00:43
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream stable release v2.5.11. (Note that I'm just going to implicitly keep this rebased against upstream's latest stable release from now on.)

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 46145eb to c779bce Compare November 29, 2020 19:55
@RandomDSdevel
Copy link
Member Author

     (Never mind, I decided it might well be a better idea to leave behind a more explicit breadcrumb trail with regard to when I've rebased and against what upstream release.) Rebased against upstream stable release v2.5.12.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from c779bce to a9d4c12 Compare December 2, 2020 00:28
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream stable release v2.6.0.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from a9d4c12 to 4e46b51 Compare December 11, 2020 01:20
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream stable release v2.6.1.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 4e46b51 to 5bd9ad2 Compare December 14, 2020 21:12
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream stable release v2.6.2.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 5bd9ad2 to 4807534 Compare December 21, 2020 22:12
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream stable release v2.7.0.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 4807534 to 5fc3301 Compare December 31, 2020 00:21
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream stable release v2.7.1.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 5fc3301 to 8367516 Compare January 6, 2021 19:31
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream stable release v2.7.2.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 8367516 to 956ed2f Compare January 16, 2021 23:52
@RandomDSdevel
Copy link
Member Author

      Rebased against upstream stable release v2.7.5.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 956ed2f to 0487436 Compare January 28, 2021 21:56
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v2.7.7.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 0487436 to d44cac1 Compare February 5, 2021 18:39
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.0.11.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from f0ba650 to fbefafb Compare April 24, 2021 00:17
@RandomDSdevel
Copy link
Member Author

     Rebased on upstream release v3.1.3.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from fbefafb to adcef40 Compare May 2, 2021 17:11
@RandomDSdevel
Copy link
Member Author

     Rebased on upstream release v3.1.5.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from adcef40 to 7c18b0b Compare May 14, 2021 23:10
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.1.7.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 7c18b0b to 4446816 Compare May 22, 2021 15:43
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.1.8.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 4446816 to 668db56 Compare May 25, 2021 22:50
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.1.9.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 668db56 to 7b0de2b Compare June 20, 2021 21:41
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.1.12.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 7b0de2b to 4026e98 Compare June 24, 2021 21:49
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.2.0.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 4026e98 to ca803ca Compare July 13, 2021 00:56
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.2.2.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from ca803ca to 7579e75 Compare August 10, 2021 01:55
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.2.6.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 7579e75 to a154a77 Compare August 21, 2021 21:54
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.2.8.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from a154a77 to b2edcdb Compare September 17, 2021 00:38
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.2.12.

@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from b2edcdb to 2fac927 Compare October 8, 2021 01:20
@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 2fac927 to c1706c8 Compare October 20, 2021 00:36
@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from c1706c8 to 952f95f Compare November 11, 2021 01:01
@RandomDSdevel
Merge branch 'master' into RandomDSdevel/manually_sort-of_rebase-with…
a983c05 
…-history_commit_49aceb152

     Part of a 'manual' 'rebase with history.'
@RandomDSdevel
Reintroduce and adapt commit 49aceb152.
13339de 
     Account for differences between upstream versions 1.9.3 and 3.3.3 (the
latter being the latest stable one upstream as of this commit,) namely with
respect to how argument parsing is implemented.

---

Summary of old changes prior to manual rebase/adaptation:

brew.rb:  Undeprecate `HOMEBREW_BUILD_FROM_SOURCE`.

     Partially revert Homebrew#5477.

---

Additionally, restore and/or add documentation relevant to this environment va-
riable.

**IMPORTANT NOTE!!!**:  _Neither this commit nor the one it's based on restores
or restored the funcitonality which setting `HOMEBREW_BUILD_FROM_SOURCE` trig-
gered before that got removed later!_  This shortcoming will be addressed in the
future in one or more commits.
@RandomDSdevel RandomDSdevel force-pushed the RandomDSdevel/manually_sort-of_rebase-with-history_commit_49aceb152 branch from 952f95f to 13339de Compare November 30, 2021 19:04
@RandomDSdevel
Copy link
Member Author

     Rebased against upstream release v3.3.6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@RandomDSdevel