Re: [tei-council] repo

Did you do this on the Oxford one as well? (If so, thank you.) -James On 11/09/15 13:42, Martin Holmes wrote:

I wiped out the workspaces on Jenkins. Running the jobs again now, which should cause a fresh checkout.

Cheers, Martin

On 15-09-11 04:04 AM, Hugh Cayless wrote:

...

Of course.

Rename TEI/ (assuming that’s the directory name you cloned into) $ mv TEI TEI.bak $ git clone https://github.com/TEIC/TEI.git

If you have changes in your old copy, just copy them over and commit. E.g. (in the new clone) $ git checkout lb42-pureodd $ rsync -av ../TEI.bak ./ $ git commit -am "A commit message of your own composition." $ git push origin lb42-pureodd

Martin and James: This change may mean Jenkins needs to be told to re-clone the repo too. Old copies of the repo won’t merge cleanly with the new one, as the commit history has been rewritten. This should never have to be done again, but it seemed important to get it right.

...

On Sep 11, 2015, at 6:39 , Lou Burnard wrote:

Hugh writes

...

You’ll probably be better off if you grab a new clone of the data rather than trying to merge the old one.

For avoidance of doubt, and for the benefit of those still struggling with gittery, could you spell out what that means in terms of command line commands?

I assume I need to clone a new version of the repo if I want to change things in the trunk source (e.g. answer a ticket or two), having further assumed that the freeze on source updates is no longer in effect?

And lastly (sorry to ask so many stupid questions) do I also need to refresh my current P5-Pure branch repo ?

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

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