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 punctuation #449

Merged
merged 3 commits into from
Oct 19, 2023
Merged

fix punctuation #449

merged 3 commits into from
Oct 19, 2023

Conversation

martinpopel
Copy link
Member

UD_EWT does not follow the UD guidelines on punctuation attachment.
This causes many problems such as incompatibility with other English UD trebanks (e.g. GUM follows the guidelines) or users of parsers trained on UD_EWT complaining about non-projective punct attachments.

This is my attempt to fix the errors in UD_EWT using ud.FixPunct.
This PR includes also the script which applies the Udapi block and creates HTML diff files for easier checking of the edits in this PR.

@nschneid
Copy link
Contributor

nschneid commented Oct 19, 2023

Thanks but how is this different from #448? I see, you wanted me to merge.

@nschneid nschneid merged commit 4b1f6fb into UniversalDependencies:dev Oct 19, 2023
@martinpopel
Copy link
Member Author

Yes, I wanted you to check it and merge it (and I forgot I have push access to this repo).

@nschneid
Copy link
Contributor

OK. I already did a git pull locally. What should I do now:

$ git pull
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.

@AngledLuffa
Copy link
Contributor

AngledLuffa commented Oct 19, 2023 via email

@nschneid
Copy link
Contributor

Thanks that worked. Didn't have any local changes.

@dan-zeman
Copy link
Member

OK. I already did a git pull locally. What should I do now:

$ git pull
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.

What happened here? Did someone meddle with the commit history? It seems to have knocked down the on-line validation infrastructure (which cannot "always do git reset --hard origin/dev").

@martinpopel
Copy link
Member Author

Did someone meddle with the commit history?

Yes, I did git push --force and I am sorry for the troubles caused. I forgot that the automatic on-line validation will pull each commit even if it is there for just 5 minutes. Now I know I should never force push to UD repos.
(The reason was that I accidentally merged this PR without anyone approving it and I didn't want to spoil the commit history with changes of thousands of files "there, back and there". Now I know it would be the better option.)

@AngledLuffa AngledLuffa mentioned this pull request Oct 27, 2023
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

4 participants