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

Add <ranges>, inadvertently ommitted from #82 #91

Merged
merged 1 commit into from
Sep 12, 2019
Merged

Add <ranges>, inadvertently ommitted from #82 #91

merged 1 commit into from
Sep 12, 2019

Conversation

CaseyCarter
Copy link
Member

I experimented with different methods of preparing the dual checkin PR, and chose the wrong one.

@CaseyCarter
Add <ranges>, inadvertently ommitted from #82
64a30ad 
I experimented with different methods of preparing the dual checkin PR, and chose the wrong one.
@CaseyCarter
Copy link
Member Author

CaseyCarter commented Sep 12, 2019 •
edited
Loading

chose the wrong one

Do not diff the internal and external repos and attempt to cleanup with --diff-filter; it is just as messy as it seems. The straightforward approach (git -C msvc diff COMMIT~1 COMMIT src\vctools\crt\github | git -C stl apply -p5) seems to require lots of typing, but is best.

@CaseyCarter CaseyCarter merged commit fc0ad92 into microsoft:master Sep 12, 2019
@CaseyCarter CaseyCarter deleted the ranges_snafu branch September 12, 2019 01:26
@StephanTLavavej StephanTLavavej added the ranges C++20/23 ranges label Jul 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BillyONeal BillyONeal BillyONeal approved these changes

Assignees
No one assigned
Labels
ranges C++20/23 ranges
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@CaseyCarter @BillyONeal @StephanTLavavej