Skip to content

Add script and documentation for minimizing patches #3462

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.

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

Closed
code-asher opened this issue May 24, 2021 · 2 comments · Fixed by #4997
Closed

Add script and documentation for minimizing patches #3462

code-asher opened this issue May 24, 2021 · 2 comments · Fixed by #4997
Assignees
Labels
chore Related to maintenance or clean up
Milestone

Comments

@code-asher
Copy link
Member

code-asher commented May 24, 2021

We can see the differences between code-server and VS Code with something like this (will have to be tweaked to work in all cases):

#!/usr/bin/env bash
set -euo pipefail

main() {
  cd "$(dirname "$0")/../.."

  local upstream=$1 ; shift
  local main=$1 ; shift

  git diff "$upstream" "$main" --name-only \
    | grep -v 'yarn.lock$' \
    | grep -v '^src/typings/' \
    | xargs git diff "$upstream" "$main" --
}

main "$@"

Example usage:

./diff.bash vscode/release/1.57 origin/main:lib/vscode

So I'm thinking we should make this part of the upgrade process to ensure we don't have differences we shouldn't (currently we do, probably somehow happened in the various squashes) and to help us keep tabs on what we've actually changed. There are changes we've made here that we can move out or refactor to minimize future conflicts.

@code-asher code-asher added the chore Related to maintenance or clean up label May 24, 2021
@code-asher code-asher modified the milestones: On Deck, 3.11.0 May 24, 2021
@jsjoeio jsjoeio modified the milestones: 3.11.0, 3.12.0 Jul 19, 2021
@jsjoeio jsjoeio modified the milestones: 3.12.0, On Deck Aug 11, 2021
@stale
Copy link

stale bot commented Feb 7, 2022

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no activity occurs in the next 5 days.

@stale stale bot added the stale label Feb 7, 2022
@jsjoeio
Copy link
Contributor

jsjoeio commented Feb 7, 2022

Not stale

@stale stale bot removed the stale label Feb 7, 2022
@jsjoeio jsjoeio modified the milestones: On Deck, March 2022 Mar 22, 2022
@code-asher code-asher self-assigned this Mar 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Related to maintenance or clean up
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants