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

Deprecated the <re> element #2521

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Deprecated the <re> element #2521

merged 4 commits into from
Jan 26, 2024

Conversation

trishaoconnor
Copy link
Contributor

Deprecated the <re> element for #2487 and in examples replaced <re> with <entry> element with the @type set to "relatedEntry".

@laurentromary
Copy link
Contributor

I have checked this pull request and it all seems like we want it. Thanks!

Copy link
Member

@HelenaSabel HelenaSabel left a comment

Choose a reason for hiding this comment

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

My first comment concerns commit 61247e5: I think it might have been included in this PR by mistake.

Then I made a suggestion so that the recommended value for @type in the deprecation note matches the examples. @trishaoconnor: if you agree you can click on “commit suggestion” :)

P5/Source/Specs/re.xml Outdated Show resolved Hide resolved
Co-authored-by: Helena Bermúdez Sabel <[email protected]>
@trishaoconnor
Copy link
Contributor Author

Thank you @HelenaSabel for spotting these mistakes. My apologies for not recognising that the commit was added to this PR. That was an accident. I have clicked "commit suggestion" so the deprecation note now matches the examples.

@HelenaSabel
Copy link
Member

HelenaSabel commented Jan 22, 2024

@trishaoconnor: do you want to try to delete commit 61247e5? I think you could try:

git revert --strategy resolve 61247e54d5412e5f1a2e46adb76ef92879c66b3a

That will delete the commit (without altering the history). But if @sydb, who is assigned to this PR, thinks it’s ok to merge it as it is, fine with me :)

@sydb
Copy link
Member

sydb commented Jan 26, 2024

Yes, the global addition of mode="add" was added to this PR by mistake. But since it is a separate commit, and has no effect on anything anyway, I would just not worry about it. (Except to avoid a “squash and merge”.)
But that may just be me being lazy — feel free to separate to a separate PR if y’all think it important.

@sydb
Copy link
Member

sydb commented Jan 26, 2024

An attempt to ping @GusRiva on the TEI repo. Please ignore.

@HelenaSabel HelenaSabel merged commit cad1efc into dev Jan 26, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants