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

Lost changes to P1754R1 (LWG Motion 11) #3153

Merged
merged 2 commits into from Feb 25, 2021
Merged

Conversation

burblebee
Copy link
Contributor

@burblebee burblebee commented Aug 8, 2019

These fixes from branch motions-2019-07-lwg-11 were lost in the new branch motions-2019-07-lwg-11-rs. The 2nd commit in this PR encodes additional but unconventional uses of concept names with \libconcept, but more work may still be needed - see related inline comments in PR #3149.

Update 2/25/21: Most of the changes in the original patch had already been fixed in master since this PR was created. The rebased branch has been updated to include the few changes that remain in master.

@burblebee
Copy link
Contributor Author

The build is timing out with "Timeout waiting for network availability."

@jensmaurer jensmaurer added the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Aug 19, 2019
@jensmaurer
Copy link
Member

Please rebase and fix the conflicts, then force-push.

@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 25, 2020

I think this is obsolete now, @burblebee?

@tkoeppe tkoeppe closed this Nov 25, 2020
@burblebee burblebee reopened this Nov 27, 2020
@burblebee
Copy link
Contributor Author

@tkoeppe, no these changes were absolutely needed. I didn't realize they hadn't been applied yet.
I still have the branch thankfully - will see what still needs to be applied after we get thru the current motions.

@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 27, 2020

Aha, thank you, sorry about that! Could you please open a regular pull request for those changes then? (Or indeed reopen and update this one?) Thanks!

@burblebee
Copy link
Contributor Author

Aha, thank you, sorry about that! Could you please open a regular pull request for those changes then? (Or indeed reopen and update this one?) Thanks!

Is this not a regular PR? Yes, will update and rebase after the current motions are applied ( I suspect many of these changes have been found and fixed already).

@tkoeppe
Copy link
Contributor

tkoeppe commented Dec 1, 2020

Sorry, yes, this is of course a regular PR, I failed to say that I was implicitly thinking "from a branch on your own fork", as opposed to adding PR branches to this repo. But let's leave this as is now, once it's rebased and dealt with, we'll delete the branch. Thanks!

@jensmaurer jensmaurer removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Feb 25, 2021
@jensmaurer jensmaurer added this to the post-2021-02 milestone Feb 25, 2021
source/support.tex Outdated Show resolved Hide resolved
source/utilities.tex Outdated Show resolved Hide resolved
@jensmaurer jensmaurer merged commit 1ecf1e8 into master Feb 25, 2021
@jensmaurer jensmaurer deleted the motions-2019-07-lwg-11-rs branch February 25, 2021 20:12
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.

None yet

3 participants