fix punctuation

[martinpopel]

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]

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

[martinpopel]

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

[nschneid]

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]

Are there changes you want to keep in your local branch? If not, you can always do

git reset --hard origin/dev

if instead you want to keep stuff, it really depends on the context

On Wed, Oct 18, 2023 at 6:29 PM Nathan Schneider @.***> wrote:

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.

— Reply to this email directly, view it on GitHub https://github.com/UniversalDependencies/UD_English-EWT/pull/449#issuecomment-1769746760, or unsubscribe https://github.com/notifications/unsubscribe-auth/AA2AYWKPFPYHOHOLYGS3METYAB67PAVCNFSM6AAAAAA6GMEPWCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTONRZG42DMNZWGA . You are receiving this because you are subscribed to this thread.Message ID: @.***>

[nschneid]

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

[dan-zeman]

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]

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.)