X Tutup
The Wayback Machine - https://web.archive.org/web/20220622020418/https://github.com/PowerShell/PowerShell/pull/17413
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.

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

Fix mariner mappings #17413

Merged
merged 1 commit into from May 23, 2022
Merged

Fix mariner mappings #17413

merged 1 commit into from May 23, 2022
+2 −2

Conversation

TravisEz13
Copy link
Member

@TravisEz13 TravisEz13 commented May 23, 2022 •
edited

PR Summary

PR Context

PR Checklist

@pull-request-quantifier
Copy link

@pull-request-quantifier pull-request-quantifier bot commented May 23, 2022

This PR has 4 quantified lines of changes. In general, a change size of upto 200 lines is ideal for the best PR experience!

Quantification details 

Label      : Extra Small
Size       : +2 -2
Percentile : 1.6%

Total files changed: 1

Change summary by file extension:
.json : +2 -2

Change counts above are quantified counts, based on the PullRequestQuantifier customizations.

Why proper sizing of changes matters

Optimal pull request sizes drive a better predictable PR flow as they strike a
balance between between PR complexity and PR review overhead. PRs within the
optimal size (typical small, or medium sized PRs) mean:

  • Fast and predictable releases to production:
    • Optimal size changes are more likely to be reviewed faster with fewer
      iterations.
    • Similarity in low PR complexity drives similar review times.
  • Review quality is likely higher as complexity is lower:
    • Bugs are more likely to be detected.
    • Code inconsistencies are more likely to be detetcted.
  • Knowledge sharing is improved within the participants:
    • Small portions can be assimilated better.
  • Better engineering practices are exercised:
    • Solving big problems by dividing them in well contained, smaller problems.
    • Exercising separation of concerns within the code changes.

What can I do to optimize my changes

  • Use the PullRequestQuantifier to quantify your PR accurately
    • Create a context profile for your repo using the context generator
    • Exclude files that are not necessary to be reviewed or do not increase the review complexity. Example: Autogenerated code, docs, project IDE setting files, binaries, etc. Check out the Excluded section from your prquantifier.yaml context profile.
    • Understand your typical change complexity, drive towards the desired complexity by adjusting the label mapping in your prquantifier.yaml context profile.
    • Only use the labels that matter to you, see context specification to customize your prquantifier.yaml context profile.
  • Change your engineering behaviors
    • For PRs that fall outside of the desired spectrum, review the details and check if:
      • Your PR could be split in smaller, self-contained PRs instead
      • Your PR only solves one particular issue. (For example, don't refactor and code new features in the same PR).

How to interpret the change counts in git diff output

  • One line was added: +1 -0
  • One line was deleted: +0 -1
  • One line was modified: +1 -1 (git diff doesn't know about modified, it will
    interpret that line like one addition plus one deletion)
  • Change percentiles: Change characteristics (addition, deletion, modification)
    of this PR in relation to all other PRs within the repository.

Was this comment helpful? 👍  👌  👎 (Email)
Customize PullRequestQuantifier for this repository.

@TravisEz13 TravisEz13 merged commit 90703cb into master May 23, 2022
13 of 33 checks passed
@TravisEz13 TravisEz13 deleted the TravisEz13-patch-8 branch May 23, 2022
@TravisEz13
Copy link
Member Author

@TravisEz13 TravisEz13 commented May 23, 2022

/backport to release/v7.2.5

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 23, 2022 •
edited by unfurl-links[bot] bot

Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2374311804

GitHub
PowerShell for every system! Contribute to PowerShell/PowerShell development by creating an account on GitHub.

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 23, 2022

@TravisEz13 backporting to release/v7.2.5 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix mariner mappings
Using index info to reconstruct a base tree...
M	tools/packages.microsoft.com/mapping.json
Falling back to patching base and 3-way merge...
Auto-merging tools/packages.microsoft.com/mapping.json
CONFLICT (content): Merge conflict in tools/packages.microsoft.com/mapping.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix mariner mappings
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@adityapatwardhan
Copy link
Member

@adityapatwardhan adityapatwardhan commented May 24, 2022

/backport to release/v7.2.5

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 24, 2022 •
edited by unfurl-links[bot] bot

Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2380566246

GitHub
PowerShell for every system! Contribute to PowerShell/PowerShell development by creating an account on GitHub.

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 24, 2022

@adityapatwardhan backporting to release/v7.2.5 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix mariner mappings
Using index info to reconstruct a base tree...
M	tools/packages.microsoft.com/mapping.json
Falling back to patching base and 3-way merge...
Auto-merging tools/packages.microsoft.com/mapping.json
CONFLICT (content): Merge conflict in tools/packages.microsoft.com/mapping.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix mariner mappings
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

TravisEz13 added a commit to TravisEz13/PowerShell that referenced this issue May 24, 2022
@TravisEz13
Fix mariner mappings (PowerShell#17413)
6806cac 
# Conflicts:
#	tools/packages.microsoft.com/mapping.json
@TravisEz13
Copy link
Member Author

@TravisEz13 TravisEz13 commented May 31, 2022

/backport to release/v7.2.5

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 31, 2022 •
edited by unfurl-links[bot] bot

Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2416850560

GitHub
PowerShell for every system! Contribute to PowerShell/PowerShell development by creating an account on GitHub.

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 31, 2022

@TravisEz13 backporting to release/v7.2.5 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix mariner mappings
Using index info to reconstruct a base tree...
M	tools/packages.microsoft.com/mapping.json
Falling back to patching base and 3-way merge...
Auto-merging tools/packages.microsoft.com/mapping.json
CONFLICT (content): Merge conflict in tools/packages.microsoft.com/mapping.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix mariner mappings
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

TravisEz13 added a commit that referenced this issue May 31, 2022
@TravisEz13
Fix mariner mappings (#17413)
5c804e2
@TravisEz13
Copy link
Member Author

@TravisEz13 TravisEz13 commented May 31, 2022

backported to 7.2 5c804e2

@TravisEz13 TravisEz13 mentioned this pull request Jun 7, 2022
Merged
22 tasks
@adityapatwardhan adityapatwardhan added the CL-BuildPackaging label Jun 16, 2022
@msftbot
Copy link

@msftbot msftbot bot commented Jun 21, 2022

🎉v7.2.5 has been released which incorporates this pull request.🎉

Handy links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adityapatwardhan adityapatwardhan

@PaulHigin PaulHigin

@daxian-dbw daxian-dbw

@anmenaga anmenaga

Assignees

@PaulHigin PaulHigin

Labels
Backport-7.2.x-Done CL-BuildPackaging Extra Small
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@TravisEz13 @adityapatwardhan @PaulHigin
X Tutup