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

Fix compare file structure #378

Merged
merged 1 commit into from
Jan 24, 2021
Merged

Fix compare file structure #378

merged 1 commit into from
Jan 24, 2021

Conversation

denny
Copy link
Contributor

@denny denny commented Jan 21, 2021

This PR fixes issue #287; the reports for both branches and the diff report all end up where the top-of-page links expect them to be (which is also where humans expect them to be, going by the comments on that issue).

@denny
Copy link
Contributor Author

denny commented Jan 21, 2021

@etagwerker, as you commented on the issue, perhaps you could review this when you get a chance?

I went for a minimal intervention approach here - just stashing a copy of the root path before it starts being changed, and using that copy as the 'source of truth' in the method that was concatenating successive changes before.

I think a more correct solution would be not to change Config.root_path at all - it doesn't sound like something that should be mutable - but fixing that looked like it would involve changing a lot more code.

Copy link
Collaborator

@etagwerker etagwerker left a comment

Choose a reason for hiding this comment

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

@denny Looks good 👍

Could you please update the CHANGELOG as well?

@denny
Copy link
Contributor Author

denny commented Jan 24, 2021

Oh yeah, sorry, I meant to ask about that; what do I do about version numbers for the changelog, am I meant to bump the patch level in the PR and use the new number?

@etagwerker
Copy link
Collaborator

@denny if you can add a note that's fine. I'll bump the version right before I cut a new release.

For reference you can check some of the latest PRs we have merged.

Thank you! ❤️

Copy link
Collaborator

@etagwerker etagwerker left a comment

Choose a reason for hiding this comment

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

@denny Great, thanks! 💯

@etagwerker etagwerker merged commit d673a2c into whitesmith:master Jan 24, 2021
@denny denny deleted the fix/compare-file-structure branch January 25, 2021 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants