Re: [tei-council] att.global.source branch for issue #536

Have you tried building your branch locally? That would be my first step... On 28/11/16 15:31, James Cummings wrote:

No, I'm suggesting merging the att.global.source branch into dev. I'm assuming because it creates a new global attribute (and removes where it was before -- let me know if I've missed anywhere) that it will break lots of things. (Hence why I don't want to do it without someone else around to help me figure out what has broken. ;-) )

-James

On 28/11/16 15:11, Hugh Cayless wrote:

...

What branches do you want to merge? If you're talking about creating the pre-release branch, there are step-by-step instructions in http://teic.github.io/TCW/tcw22.html

On Mon, Nov 28, 2016 at 9:51 AM, James Cummings mailto:James.Cummings@it.ox.ac.uk> wrote:

Hi all,

Just to update, I've added prose to ST chapter on att.global.source (and since att.global.responsibility wasn't mentioned briefly there I added a bit on that in the same section.)

See this commit: https://github.com/TEIC/TEI/commit/95fb1d9a86081caf445802f7cb61d87ddd9cd38b https://github.com/TEIC/TEI/commit/95fb1d9a86081caf445802f7cb61d87ddd9cd38b

I would be very happy to get some more eyes on this and the schema changes below.

And I still am not familiar with merging branches and the best way to do this. If some github guru wants to open up a chat (text chat that is, since I'm in a launch conference for the Digital MSS Toolkit here at the Bodleian) and walk me through it I'm willing to try. I do predict below it will break testing.

-James

On 26/11/16 23:57, James Cummings wrote:

Hiya,

I believe I've done the schema-related changes for release-blocking issue #536 (there are still bits of prose to change). Since this was adding a @source attribute in a new global class I did the various changes in a branch. I've not done anything about the testing which I'm sure the changes to classes (att.source and att.readFrom) will break. (But then again, I've never understood the testing and expected results as well as I should.) I'd appreciate someone looking at the changes and seeing if you see anything I've forgotten to do (other than prose updates in the chapters), and also to give me some advice on merging the branch in (or go ahead and do it if it looks good) and/or fixing the needed tests.

See most recent change at https://github.com/TEIC/TEI/tree/att.global.source https://github.com/TEIC/TEI/tree/att.global.source namely https://github.com/TEIC/TEI/commit/69d00eb5b1f762eded61ad836a723c4ad0e4bc5d https://github.com/TEIC/TEI/commit/69d00eb5b1f762eded61ad836a723c4ad0e4bc5d This changes 37 files with 96 additions and 119 deletions github tells me.

-James

-- Dr James Cummings, James.Cummings@it.ox.ac.uk mailto:James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford

-- tei-council mailing list tei-council@lists.tei-c.org mailto:tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council http://lists.lists.tei-c.org/mailman/listinfo/tei-council

PLEASE NOTE: postings to this list are publicly archived