Re: [tei-council] GitHub Repo import

On Aug 30, 2015, at 12:53 , Lou Burnard wrote:

Thanks -- that's very helpful.

I tried it, and have only few very minor problems to report:

a) Why does it insist on calling my working copy "Guidelines" ? Can I rename it to something else?

You can rename the directory anything you like. Martin had mentioned wanting to change the repo name, and we certainly can. What should we call it?

b) After my git checkout P5-Pure it says:

Branch P5-Pure set up to track remote branch P5-Pure from origin. Switched to a new branch 'P5-Pure'

but how do I remember that the folder called "Guidelines" now contains that branch, rather than the original trunk?

The thing to do is run "git status" which will tell you what branch you’re on and what the state of your repo is currently. If you do accidentally commit something to the wrong branch, it’s fixable (harder if you’ve already pushed your changes, but fixable even then). To get the master branch, just do git checkout master It will whine at you if you have uncommitted changes, which can be dealt with in a couple of ways, the simplest being just to commit them.

c) When I first tried to do a git commit, it wanted my email address and name, even though I suspect I could have said anything here, because when I later on did a "git log", the email address shown for my earlier commits is nonexistent.

I didn’t think about this, but the first time you use Git, you should set up your name and address, thus: git config --global user.name "John Doe" git config --global user.email johndoe@example.com (using your own email and name, obviously, see https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup)

Of course the first thing I want to do after my successful commit is to run make. This (the Makefile) needed tweaking to say"git" rather than "svn" as value for VCS, but with that change, I think I have got to the same dtd-related brickwall as earlier in the month.

I looked quickly at the README which seems clear enough (I do now understand why you chaps say git is so much better for branches than svn).

You might perhaps mention that "git log" at the unix command line puts you into an editor of sorts: it's handy to know that you can do q to exit, type a regexp, etc.

Yeah, that’s a good point. I think it uses less, or some similar pager, so you can browse around in the log instead of having to pipe it into a reader. I’ve added it to the README.

.

On 30/08/15 14:38, Hugh Cayless wrote:

...

You could try:

git clone https://github.com/TEIC/Guidelines.git https://github.com/TEIC/Guidelines.git

cd Guidelines

git checkout P5-Pure

copy your changes into Guidelines/ in the right spot.

If you have any new files:

git add path/to/new/file

git commit -am "What I did on my summer vacation."

git push origin P5-Pure

All done! See also https://github.com/TEIC/Guidelines-TEST/blob/master/README.md https://github.com/TEIC/Guidelines-TEST/blob/master/README.md and let me know where it fails to elucidate what’s going on.

Basically, git clone == svn checkout; git add == svn add; git commit + git push == svn commit. The main difference being that you have a full copy of the repo locally, so you have an extra step of syncing your local repo with the remote repo.

...

On Aug 29, 2015, at 11:56 , Lou Burnard wrote:

You know those cartoons where the human is talking to the cat? and the cat hears only the word "food"? "clone", "commit and push" don't mean a lot to the unregenerate svn user.

On 29/08/15 16:22, Hugh Cayless wrote:

...

You could just clone the git repo, checkout the pure branch, copy your changes over, commit and push :-)

Happy to help if you need advice on doing so. It’d be a good test of the new repo.

...

On Aug 29, 2015, at 7:30 , Lou Burnard wrote:

On 26/08/15 14:17, Hugh Cayless wrote:

...

The tickets are not frozen, and are not moving yet (I just filed a bug!). The repo is the only thing that’s moving, and nothing irreversible has been, or will be done.

OK that is reassuring, but still a bit annoying if (like me) you have just come back from a month offline with a bunch of changes you'd like to be able to commit to a SF repo branch for testing !

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

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