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

proposal: merge all of trunk into release-pismo #6364

Closed
warner opened this issue Sep 30, 2022 · 3 comments
Closed

proposal: merge all of trunk into release-pismo #6364

warner opened this issue Sep 30, 2022 · 3 comments
Labels
enhancement New feature or request

Comments

@warner
Copy link
Member

warner commented Sep 30, 2022 •
edited
Loading

What is the Problem Being Solved?

Some of the changes we want to include on release-pismo touch many files (typescript improvements), and cherry-picking the minimal set of changes to release-pismo is hard work. If we can afford to just include everything currently on trunk in release-pismo, it would be a lot easier.

Changes currently on trunk that are not on release-pismo

Since we forked off release-pismo, the master branch has commits for the following PRs (oldest first):

issue/PR status who description
#6278 dckc feat(agoric-cli): proposeChangeMintLimit
#6265 turadg fix-wallet-show-num-Wants-satisfied
#6252 gibson 6248-followup swing-store, snapshot streams
#6287 turadg contract-types
#6292 turadg streamline-local
#6289 sam/turadg provision-wallet-ui
#6309 sam await-keplr
#6316 dckc feat(agoric-cli): support --home, --keyring-backend
#6328 sam wallet-rejected-offers
#6332 sam optimistic-wallet-bridge
#6325 on pismo mhofman slog sender in subprocess
#6331 kris new Endo
#6338 on pismo mhofman run CI/mergify on release-pismo
#6333 dckc 6329-offer-summary
#6317 turadg gov-wallet-misc
#6348 on pismo chibbert set decimalPlaces when calling startPSM
#6352 on pismo mhofman better-handle-misbehaving-slog-senders
#6324 on pismo mfig mfig-deterministic-bundle
#6327 markm test-rankOrder works on ava 3 or 4
#6354 sam wallet-decimal-places
#6359 wanted on pismo mfig/turag 6174-wallet-current
@warner warner added the enhancement New feature or request label Sep 30, 2022
@warner
Copy link
Member Author

warner commented Sep 30, 2022

#6327 is safe. I expect the new Endo is not risky (#6331).

@warner
Copy link
Member Author

warner commented Sep 30, 2022

@Tartuffo and @arirubinstein approve the plan

warner added a commit that referenced this issue Sep 30, 2022
@warner
Merge branch 'release-pismo' into merge-pismo-into-trunk
499022f 
This is a merge from `release-pismo` into current `master`. The few
conflicts were resolved in favor of what was already on `master`. The
patch-package diff on `release-pismo` for endo/bundle-source 2.3.0 was
removed, because `master` had been upgraded to 2.3.1, and had its own
patch.

This ensures that we haven't left any changes behind (included in
release-pismo but not on trunk).

Once complete, we can fast-forward `release-pismo` to this commit, to
complete #6364 ("merge all of trunk into release-pismo"). At that
point, both branches will have this commit as their shared common
ancestor.
@warner warner mentioned this issue Sep 30, 2022
Merged
@warner
Copy link
Member Author

warner commented Sep 30, 2022

Ok, I merged everything from release-pismo into trunk in #6365 (settling conflicts in favor of what was on trunk, e.g. Endo/bundle-source being 2.3.1 instead of 2.3.0), which resulted in commit ebbfc42 as the new value of master. Then I fast-forwarded release-pismo to ebbfc42. For the moment, both master and release-pismo refer to the same commit.

@warner warner closed this as completed Sep 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@warner