Skip to content

SOAS FIHRIST Pull Requests #68

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

ek13
Copy link

@ek13 ek13 commented Oct 8, 2018

Dear Andrew,
SOAS decided to change where and how it commits its FIHRIST (and eventually other catalogue) record entries. Simon Bowie ([email protected]) maintains the SOAS GitHub -- /soas-library/fihrist-mss.
New procedure requires Peter to commit to the SOAS-Library then issue a pull request to you at /fihristorg/fihrist-mss
Erich

@andrew-morrison
Copy link
Contributor

Your new procedure is fine by me. Long term, other people will have to learn to review and merge the pull requests (I've added Yasmin and Huw to the list of reviewers.)

But there are problems with the changes which mean I won't be merging this particular pull release. It contains new files without the schema declaration at the top, lack a unique manuscript ID in the xml:id attribute of the root TEI elements, contain authors with keys which don't use the "person_" format, and subjects not using the term element or a key attribute. Examples here, here, here, and here. Also the work titles don't have key attributes, so won't be included in the Works index on the web site (but that could be intentional.)

Also, it should be noted that your SOAS fork was taken from a version of the original repository back in April. That doesn't matter so much for adding and correcting SOAS records, but Peter will be missing his previous changes in his local working copy. It also means the authority files contain none of the new entries for work titles, person names or subject keywords added since by Cambridge, Oxford, Manchester and colleges. I'd suggest @SimonXIX resyncs your fork now, and regularly from now on if Peter wants to contribute to improving the authority files.

@SimonXIX
Copy link

SimonXIX commented Oct 8, 2018

Thanks Andrew. I'm happy to run regular syncs: that makes sense.

Peter and Erich: I've attempted to resync but been told that 'ms. 48052.xml' would be overwritten by a merge from Fihrist's upstream repository. Could you please move it elsewhere temporarily to keep it safe and let me know when you've done so? I'll then try running the merge again. Long-term, we'll need to figure out a schedule for regular syncing.

Merging from FIHRIST upstream repository to take in previous changes
made to FIHRIST records and to update new entries from FIHRIST authority
files.
@SimonXIX
Copy link

SimonXIX commented Oct 8, 2018

I've now synced the changes from FIHRIST and pushed those changes to our remote fork. Both our working copy and our remote should be in sync with FIHRIST's repository (apart from our local changes).

@ek13
Copy link
Author

ek13 commented Oct 8, 2018 via email

@ahankinson
Copy link
Contributor

One thing you may wish to keep in mind with this workflow is that, if you are committing records 'upstream' to the fihrist organization github from SOAS, it would be easier to do it in a separate branch rather than on 'master'. A common pattern in using GitHub is to create a specific 'branch' for submitting specific updates, and then request that they be merged.

So rather than merging 'soas:master' into 'fihristorg:master', you might request to merge 'soas:updates-to-blah' into 'fihristorg:master'.

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.

5 participants