Skip to content

Conversation

@BethanyG
Copy link
Member

@BethanyG BethanyG commented Apr 11, 2023

Used configlet 4.0.0-beta.10 to sync exercises to problem specifications.

This seems like a pretty large list, so I am not sure if something went wrong, or there are very small changes that were picked up by configlet that weren't there last month.

edited to add -- the bulk of these look like one sentence per line edits and other small tidyings.

.docs changes:

  • modified: exercises/practice/accumulate/.docs/instructions.md
  • modified: exercises/practice/binary-search/.docs/instructions.md
  • modified: exercises/practice/binary/.docs/instructions.md
  • modified: exercises/practice/bowling/.docs/instructions.md
  • modified: exercises/practice/darts/.docs/instructions.md
  • modified: exercises/practice/error-handling/.docs/instructions.md
  • modified: exercises/practice/gigasecond/.docs/introduction.md
  • modified: exercises/practice/hexadecimal/.docs/instructions.md
  • modified: exercises/practice/killer-sudoku-helper/.docs/instructions.md
  • modified: exercises/practice/largest-series-product/.docs/instructions.md
  • new file: exercises/practice/largest-series-product/.docs/introduction.md
  • modified: exercises/practice/linked-list/.docs/instructions.md
  • modified: exercises/practice/nucleotide-count/.docs/instructions.md
  • modified: exercises/practice/octal/.docs/instructions.md
  • modified: exercises/practice/pangram/.docs/instructions.md
  • modified: exercises/practice/pangram/.docs/introduction.md
  • modified: exercises/practice/parallel-letter-frequency/.docs/instructions.md
  • modified: exercises/practice/rna-transcription/.docs/instructions.md
  • new file: exercises/practice/rna-transcription/.docs/introduction.md
  • modified: exercises/practice/saddle-points/.docs/instructions.md
  • new file: exercises/practice/saddle-points/.docs/introduction.md
  • modified: exercises/practice/secret-handshake/.docs/instructions.md
  • modified: exercises/practice/sieve/.docs/instructions.md
  • modified: exercises/practice/strain/.docs/instructions.md
  • modified: exercises/practice/sum-of-multiples/.docs/instructions.md
  • new file: exercises/practice/sum-of-multiples/.docs/introduction.md
  • modified: exercises/practice/trinary/.docs/instructions.md
  • modified: exercises/practice/two-fer/.docs/instructions.md

metadata changes:

  • modified: exercises/practice/binary/.meta/config.json
  • modified: exercises/practice/etl/.meta/config.json
  • modified: exercises/practice/hexadecimal/.meta/config.json
  • modified: exercises/practice/nucleotide-count/.meta/config.json
  • modified: exercises/practice/octal/.meta/config.json
  • modified: exercises/practice/point-mutations/.meta/config.json
  • modified: exercises/practice/trinary/.meta/config.json

@BethanyG BethanyG requested a review from kytrinyx April 11, 2023 01:33
@MatthijsBlom
Copy link
Contributor

Should maybe wait for exercism/problem-specifications#2261 to get merged.

Copy link
Member

@ee7 ee7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should maybe wait for exercism/problem-specifications#2261 to get merged.

I agree.

I'd suggest waiting for exercism/problem-specifications#2264 too, assuming I'm not mistaken about it.

At the time of writing, this PR is only missing exercism/problem-specifications@3f7284e, (which was merged after this PR was created):

$ git rev-parse --short HEAD
c875cb98
$ bin/configlet --version
4.0.0-beta.10
$ bin/configlet sync --docs --metadata
Updating cached 'problem-specifications' data...
Checking exercises...
[warn] docs: instructions unsynced: sum-of-multiples
[warn] some exercises have unsynced docs

@MatthijsBlom
Copy link
Contributor

I am confused. The diff suggests that e.g. the Sum of Multiples instructions will be replaced, however it seems that they already have been.

@ee7
Copy link
Member

ee7 commented Apr 11, 2023

I am confused. The diff suggests that e.g. the Sum of Multiples instructions will be replaced, however it seems that they already have been.

It's because this PR is one commit behind main. This PR is based on top of cade613.

@BethanyG
Copy link
Member Author

I'm going to merge #3398, and wait for exercism/problem-specifications#2264. This PR is 'regular maintenance', not a big rush, and can easily be re-done or rebased when the dust settles.....''

@BethanyG BethanyG added do not merge 🚧 Don't merge until this label is removed. on hold ✋🏽 Action should stop on this issue or PR for now. labels Apr 11, 2023
@MatthijsBlom
Copy link
Contributor

What, then, does the diff mean? I thought it was comparing both branches' heads, but now it seems it actually isn't.

@ee7 ee7 mentioned this pull request Apr 11, 2023
@BethanyG
Copy link
Member Author

Actually, I am going to close this for now. The velocity of change has picked up, and it is probably easier to wait for a slowdown and then re-run configlet to pick up any 'hanging' changes. I was primarily doing this to work on Bank Account, now that there is canonical data -- but I can do that as a stand-alone.

@BethanyG BethanyG closed this Apr 12, 2023
@ee7
Copy link
Member

ee7 commented Apr 14, 2023

What, then, does the diff mean? I thought it was comparing both branches' heads, but now it seems it actually isn't.

From the GitHub docs, the diff shown when clicking "Files changed" in a PR is:

the difference between the latest common commit of both branches (merge base) and the most recent version of the topic branch.

This means, for example, the diff shown in a PR stays the same when:

  • the PR is rebased (and this does not require resolving a conflict)
  • another PR is merged.

Further rationale from the same page:

Since the three-dot comparison compares with the merge base, it is focusing on "what a pull request introduces".

When you use a two-dot comparison, the diff changes when the base branch is updated, even if you haven't made any changes to the topic branch. Additionally, a two-dot comparison focuses on the base branch. This means that anything you add is displayed as missing from the base branch, as if it was a deletion, and vice versa. As a result, the changes the topic branch introduces become ambiguous.

In contrast, by comparing the branches using the three-dot comparison, changes in the topic branch are always in the diff if the base branch is updated, because the diff shows all of the changes since the branches diverged.

@MatthijsBlom
Copy link
Contributor

MatthijsBlom commented Apr 18, 2023

@ee7 Sorry, I didn't see your comment until now. I think I get it now, thanks.

@BethanyG people are getting confused by the currently slightly outdated Sum of Multiples instructions. On the plus side, the patch storm around that exercise has subsided. Shall we reopen this PR, or shall I send (a custom) one myself, or…? Edit: nevermind, the problem is not here but in faulty deployment.

@BethanyG BethanyG removed the do not merge 🚧 Don't merge until this label is removed. label Jul 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

on hold ✋🏽 Action should stop on this issue or PR for now.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants