Re: [tei-council] dtd jabberwock slain?

I've set up a new local branch as per your suggestions, but am standing by for further orders before doing any more pushing, pulling, or merging. Is an origin the same as a master? Discuss. On 01/09/15 19:22, Hugh Cayless wrote:

Well, subject to further discussion, I think, now that people's minds are concentrated on it :-)

We'd talked about naming branches to be pushed up into github <username>-<nickname>, hence hcayless-appcrit, etc. The idea being that it's clear who "owns" it in case you've no idea what it's supposed to do. Arguably we might not do this for branches that deal with really big things, and that might have multiple people working on them (and PureODD might be one of those).

Good questions! To get new branches that have appeared on the remote since you cloned your repo, just run

git fetch origin

then you should be able to do

git checkout lb42-pureodd

That should set up a new local branch to track the remote one. Then in the future, you can just git push origin lb42-pureodd and git pull origin lb42-pureodd as needed.

Merging into master would just involve:

git checkout master

git merge lb42-pureodd

There may be merge conflicts, which are resolved in much the same way as svn does: you fix them in the conflicting files and commit the fix.

On Tue, Sep 1, 2015 at 2:09 PM, Lou Burnard wrote:

...

We have a branch naming scheme? Jolly good. I expect a paragraph on same to appear in TCW22 at some point :-}

So when people start checking on this new branch, and sending me things that don't work, can I just update my local copy and push it on my head or whatever as before, or have things changed again?

Also, how do I merge these changes back into the master branch so that Mr Jenkins can get a look in?

On 01/09/15 18:40, Hugh Cayless wrote:

...

I’ve added a new branch lb42-pureodd (in keeping with our branch naming scheme) that should have the right directory structure plus the right commit history. See https://github.com/TEIC/TEI/tree/lb42-pureodd < https://github.com/TEIC/TEI/tree/lb42-pureodd>

Let me know if anything in there looks wrong. This turns out not to be a simple process, again, because of the way branches come over from svn.

On Sep 1, 2015, at 11:11 , Hugh Cayless wrote:

...

P5-Pure is structured differently than the master branch directory—it only has the contents of P5/, so it needs to be restructured to match. Working on it.

On Sep 1, 2015, at 11:06 , Martin Holmes wrote:

...

I just tried this:

mholmes@spud-2012:~/WorkData/tei/gitrepo$ git checkout P5-Pure Branch P5-Pure set up to track remote branch P5-Pure from origin. Switched to a new branch 'P5-Pure'

mholmes@spud-2012:~/WorkData/tei/gitrepo$ git pull Already up-to-date.

mholmes@spud-2012:~/WorkData/tei/gitrepo$ cd P5 mholmes@spud-2012:~/WorkData/tei/gitrepo/P5$ make clean dist make: *** No rule to make target `clean'. Stop.

And indeed there is no rule because there's no Makefile in the P5 directory. Am I missing something?

Cheers, Martin

On 15-09-01 04:32 AM, Lou Burnard wrote:

...

I have now successfully run the P5 Makefile to completion in my local copy of the P5-Pure branch. I think an exclamation mark is warranted, so here it is !

Holmes's Cunning Wheeze of post-modifying the p5subset.xml seems to do the trick. And tweaking the ANT scripts both to generate and then to use the doctored version of same was not that hard, as Martin also predicted.

However, this has yet to be tried out by anyone else, so I repeat my plea for someone to check out this branch and see if it works for them. I will of course be doing so on another computer myself, but that is not at all the same as a fresh pair of eyes.

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

PLEASE NOTE: postings to this list are publicly archived

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

PLEASE NOTE: postings to this list are publicly archived