openlilylib-user Mailing List for openLilyLib (Page 4)
Resources for LilyPond and LaTeX users writing (about) music
Status: Alpha
Brought to you by:
u-li-1973
You can subscribe to this list here.
2013 |
Jan
|
Feb
|
Mar
(45) |
Apr
(38) |
May
|
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(10) |
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2014 |
Jan
(164) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Shane B. <sh...@gr...> - 2014-01-11 18:49:12
|
Thanks to Phil's explanation of the Git thing. I finally managed to make it work. The thing that was escaping me was that it was necessary to commit a change and then push it. I had the mistaken notion you just saved your file locally and then pushed it to the cloud. I thought committing was for merging to cloud living files. So maybe I could work a VCR after all. Shane On Sat, Jan 11, 2014 at 10:27 AM, Phil Holmes <ma...@ph...> wrote: > ----- Original Message ----- > From: "David Webber" <da...@mu...> > To: "oll-user" <ope...@li...> > Sent: Saturday, January 11, 2014 3:07 PM > Subject: Re: [oll-user] Git for dummies > > >> From: Phil Holmes >> >>>{GitBash] >>> With your permission, I'll focus on this, since I'm not familiar with the >> Gui. FWIW I regard myself as a Windows power user, but since getting >> involved in LilyPond I've had to adopt some Linux, to the point now where >> I >> sometimes type 'ls' into a Windows command prompt, where I should use >> 'dir'.< >> >> OK, so reading between the lines, GitBash is a unix shell of some kind. >> I >> now have to drag microemacs out of the recesses of my memory. I used it >> as >> my C++ editor up to the mid 90s, and this is the only unix-style command >> prompt I've ever used. Still GitBash seems to like my first attempts at >> ls, pwd, mkdir, and cd, so I'm starting to feel that it is my friend :-) > > I guess it's a Unix-xtyle DOS shell, really. As I said, I now get confused > between ls and dir. > >> So I've created my local engraving-challenges directory, navigated to it, >> and done >> >> git clone https://github.com/MozartSoftware/engraving-challenges >> >> (DavidWebber is apparently a common name and I had to choose another ID). >> >>> You should see some stuff happening >> >> Stuff indeed happened, >> >>> and you should get a copy of the files from the remote repo on your hard >>> disk. >> >> and I've already blundered. I created a directory called >> .../engraving-challenges and went there. The files are now all a >> directory >> >> .../engraving-challenges/engraving-challenges/ >> >> but I suppose I can live with that for now. > > I pretty much always do that :-( > >>> Lunch beckons: let me know when you've done that. >> >> Yes! I see I have a directory >> .../engraving-challenges/engraving-challenges/challenge01/Mozart > > You should also see a number of other directories and files, for example > > engraving-challenges\challenge01\ chopin-godowsky.png > > (this was with Windows explorer for me - hence the \ / confusion. > >> Presumably I can put files there??? How do I upload them? > > Yes, you can put files into the Mozart directory, and git will recognise > them there (probably). git status will give you an idea of what's doing > > $ git status > # On branch master > # Changes not staged for commit: > # (use "git add <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working > directory) > # > # modified: Estrella.sib > # > # Untracked files: > # (use "git add <file>..." to include in what will be committed) > # > # ../../challenge01/Sibelius-7/V1 - Full Score.pdf > # ../../challenge01/Sibelius-7/V1_Bar4.sib > # ../../challenge01/Sibelius-7/V1_Bar5.sib > # ../../challenge01/Sibelius-7/V1_Complete - Full Score - Copy.pdf > # Beaming.ly > # Beaming.pdf > # Notes.txt > no changes added to commit (use "git add" and/or "git commit -a") > > So I see that I'm on branch master (back to this in a minute). I have one > file that git is tracking that I've modified, plus a number of files that > git is aware of, but is not tracking. So you should see the files you've > copied to that directory in the "Untracked files" list. So, to get git to > track them, we do: > > git add filename > > wildcards also work for filename, so git add *.png would work. There's one > gotcha here: git has a list of filetypes it ignores in the .gitignore file, > and by default .pdf is on this list - so if you're wanting to track and > upload PDFs you'll need to edit .gitignore and get rid of the pdf entry. > > OK - we've added *.png to the list of files being tracked: we now need to > tell git to take a snapshot of the current situation. We do this with a > commit: > > git commit -am 'Commit message' > > a=all files; m=use this message. > > All other things being equal, you should be able to see what's there with > gitk: this should open a GUI window and give a representation of what's > going on. You'll need to close it to get the command prompt usable again. > > All that's now needed is to actually do the upload: > > git push > > You will be prompted for (your github) username and password. This should > push your commit to the remote github server. This simple push syntax works > fine on github, but if you get into more complex repositories, there are > other options that will need taking care of. > > Think that should do for now. > > Summary: new files are added with git add; changes are snapshotted with git > commit; changes are uploaded with git push. > > Once this is all OK, we can think about branches. > > -- > Phil Holmes > > > ------------------------------------------------------------------------------ > CenturyLink Cloud: The Leader in Enterprise Cloud Services. > Learn Why More Businesses Are Choosing CenturyLink Cloud For > Critical Workloads, Development Environments & Everything In Between. > Get a Quote or Start a Free Trial Today. > http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk > _______________________________________________ > openlilylib-user mailing list > ope...@li... > https://lists.sourceforge.net/lists/listinfo/openlilylib-user |
From: Janek W. <lem...@gm...> - 2014-01-11 18:35:41
|
2014/1/11 David Webber <da...@mu...> > From: Janek Warchoł > > > I'd prefer a pdf. Jpegs have finite resolution and lossy compression > that > > introduces visible artifacts, both very unwelcome when reviewing an > > engraving in detail. > > In practice I've found that jpegs exported from Mozart at printer > resolution > are really quite acceptable. But I can save GIF or PNG if it worries you. > I'll see what I can do with PDF too. > I saw the pdf, thanks! As for the resolution, i'm not sure what you mean by "printer resolution". If it's 300 dpi, it's definitely not enough to show some fine engraving details. If it's 1200 dpi, the files would be way too big. And 600 dpi doesn't seem a good compromise... j -------------- next part -------------- An HTML attachment was scrubbed... |
From: Phil H. <em...@ph...> - 2014-01-11 17:57:45
|
Possible final Sibelius version at https://github.com/PhilHolmes/engraving-challenges/tree/master/challenge02-schumann -- Phil Holmes |
From: Urs L. <ul...@op...> - 2014-01-11 17:56:37
|
Marc Sabatella <ma...@ou...> schrieb: > This is a _very_ nice explanation, thank you. While it leaves out > some stuff we also need (which is a perfectly valid decision) I > think everything you _do_ mention is very clear. Please add this (on > the master branch) as a new file in the meta directory. > >Will do. I've never used the GitHub web interface for adding/editing >files, so that will be a new experience for me. I'll also flesh it out > >a little. But my hope is to keep this document relatively general, and > >expect the other git workflow document (which I'll link to if possible >- >not sure exactly how that would work on GitHub) to fill in the >specifics. Ok, we can of course edit the existing file too. I made it to be short, more an overview for experienced people. But if we're going to produce yet one more Git introduction that's a good idea. Linking is perfectly simple: [Link text](git-workflow.md) will produce the desired result. > >Marc -- Urs Liska openlilylib.org |
From: Marc S. <ma...@ou...> - 2014-01-11 17:53:25
|
This is a _very_ nice explanation, thank you. While it leaves out some stuff we also need (which is a perfectly valid decision) I think everything you _do_ mention is very clear. Please add this (on the master branch) as a new file in the meta directory. Will do. I've never used the GitHub web interface for adding/editing files, so that will be a new experience for me. I'll also flesh it out a little. But my hope is to keep this document relatively general, and expect the other git workflow document (which I'll link to if possible - not sure exactly how that would work on GitHub) to fill in the specifics. Marc -------------- next part -------------- An HTML attachment was scrubbed... |
From: Urs L. <ul...@op...> - 2014-01-11 17:47:58
|
Joshua Nichols <jos...@gm...> schrieb: >> >> md, I believe, is markdown - a simpler version of HTML MarkUp >(geddit?). > > >Indeed, I am using "StackEdit" which is a dummy text editor for >MarkDown. >It's useful, and it allows to send off to GitHub. > >I'm looking at all of this, and I feel overwhelmed too; I am just >taking it >one bite at a time. > >IC, > >Josh > > >On Sat, Jan 11, 2014 at 11:00 AM, Phil Holmes <ma...@ph...> >wrote: > >> ----- Original Message ----- >> From: "David Webber" <da...@mu...> >> To: "oll-user" <ope...@li...> >> Sent: Saturday, January 11, 2014 4:45 PM >> Subject: Re: [oll-user] Git for dummies >> >> >> > From: Phil Holmes >> > >> >>> OK thanks. Done all that! Can you see a pdf and a png file >from me? >> > >> >> Yep. Welcome to git. >> > >> > I'm now babbling incoherently wondering where I am. How did you >see >> > them? >> >> I went to _your_ repository: >> https://github.com/MozartSoftware/engraving-challenges >> >> At present, you can only update your own repositiry, since you don't >have >> permission to mess with Urs's original. I think he may be able to >grab >> stuff from you and upload it to his repo, but I'll leave that to him. >> >> > There's something which says branch:master, but if I change it to >another >> > 'branch' I see the same thing. >> >> A quick divert into branches. These are effectively parallel >development >> streams (which can also be merged if required). So if you were >working on >> 2 >> versions of a piece of music (I dunno, baroque and modern styles or >> something) you could create a branch for each and swap between them, >> without >> either impinging on the other. If you look at the lilypond git >interface >> you'll see _lots_ of branches - this is to allow us to work on >separate >> aspects/timelines of the system without bothering the others. >Broadly, you >> can get away without doing much about branches at this time. >> >> > PS >> > [In a spectacular leap of the imagination I have just realised that >.md >> > files are probably ascii text, so I'm going to try to modify the >one in >> > Mozart.] >> >> md, I believe, is markdown - a simpler version of HTML MarkUp >(geddit?). >> >> -- >> Phil Holmes >> >> >> >> >------------------------------------------------------------------------------ >> CenturyLink Cloud: The Leader in Enterprise Cloud Services. >> Learn Why More Businesses Are Choosing CenturyLink Cloud For >> Critical Workloads, Development Environments & Everything In Between. >> Get a Quote or Start a Free Trial Today. >> >> >http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk >> _______________________________________________ >> openlilylib-user mailing list >> ope...@li... >> https://lists.sourceforge.net/lists/listinfo/openlilylib-user >> >-------------- next part -------------- >An HTML attachment was scrubbed... >------------------------------------------------------------------------------ >CenturyLink Cloud: The Leader in Enterprise Cloud Services. >Learn Why More Businesses Are Choosing CenturyLink Cloud For >Critical Workloads, Development Environments & Everything In Between. >Get a Quote or Start a Free Trial Today. >http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk >_______________________________________________ >openlilylib-user mailing list >ope...@li... >https://lists.sourceforge.net/lists/listinfo/openlilylib-user You can also edit markdown files through the github web interface. This offers you a nice preview function. But you have to take into account that you make a commit on the server - and this may impact your work locally if you are on the same branch. (Although versioning actually _is_ there obe able to handle exactly this kind of situation). -- Urs Liska openlilylib.org |
From: Urs L. <ul...@op...> - 2014-01-11 17:45:06
|
Marc Sabatella <ma...@ou...> schrieb: >I'd like to step back and say a few things about the "big picture" >here. There are any number of "Git for dummies" tutorials out there >that you should should probably spend some time with, but having gone >through this pain myself recently with MuseScore, I can tell you the >devil is as likely to be in the details as in the concepts, because >every project structures things differently. > >Ideally, we'd all come to this (or any project) with a basic handle on >how Git works from the various tutorials that float around out there, >and the project would provide a "Git workflow" document that detailed >the specifics in a manner that would be clear enough to anyone with a >basic familiarity with Git. I think the current Git workflow document >we have here is a start, but doesn't go far enough, so maybe we need to > >work on that. > >First, though, here's my bare bones and probably a bit naive nutshell >description of Git as it applies to GitHub-based projects specifically: > >A project has a main repository (repo) stored on GitHub that is the one > >we are referring to as "upstream". This one you will *read* from (via >"git fetch upstream") whenever you need to get updated files >contributed >by others. You will never probably write to this directly. > >When you first join a project, you start by creating a "fork" of that >repo, which creates your own personal copy of that upstream. Your fork >- >which we are calling "origin" - is *also* stored on GitHub, and this is > >what you will *write* to (via "git push") when you want to make your >work available to others. After pushing to your fork, you then issue a > >"pull request" to the owner of the upstream repo that says "I have >pushed changes to my fork, please merge them into the upstream repo". >That is how your changes become available to others, and how their >changes become available to you - by being merged into the upstream >repo. > >All of this is on GitHub. You will work, of course, on your own >computer. So you do a "git clone" of your fork, which creates a local >copy of everything. This is your own personal sandbox; you play with >these files however you like, including adding new ones. Every so >often, >you decide things are at a state where you want to take a snapshot of >your current sandbox. You do this via "git commit". After one or more > >of these commits, you might decide you are at a point where you feel >these should be written to your fork on GitHub, so you do as "git >push". After one or more of these pushes, you might decide your work >is >ready to be shared with others, so you issue a "pull request" (that is > >done on GitHub). Every so often, you will also decide it would be good >to grab the work others have been contributing. So you do a "git fetch > >upstream". Because of the details of how git manages version control, >you have to also do a "git rebase" to fully incorporate their changes >into your sandbox (this is the step hardest to fully grasp, I find). >At >that point, you can in principle continue working, do more commits, >more >pushes, and pull requests, and the cycle continues. > >That's the overall flow of this and other projects that use GitHub. >When >you read the various Git tutorials out there, you won't see much talk >of >forks and pull requests - that's more of a GitHub-specific thing, I >guess. The Git tutorials focus mostly on branching, which I didn't >even >mention here. Because that's when you start getting into the details >different projects handle differently, and where I think the workflow >document for this project could stand to spell things out in more >detail. > >Anyhow, I hope this helps. > >Marc > >------------------------------------------------------------------------------ >CenturyLink Cloud: The Leader in Enterprise Cloud Services. >Learn Why More Businesses Are Choosing CenturyLink Cloud For >Critical Workloads, Development Environments & Everything In Between. >Get a Quote or Start a Free Trial Today. >http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk >_______________________________________________ >openlilylib-user mailing list >ope...@li... >https://lists.sourceforge.net/lists/listinfo/openlilylib-user This is a _very_ nice explanation, thank you. While it leaves out some stuff we also need (which is a perfectly valid decision) I think everything you _do_ mention is very clear. Please add this (on the master branch) as a new file in the meta directory. You can do this directly on. Github through the web interface - this is one more of the nice features this offers. Maybe make just a little bit clearer that - even later when you discuss actual Git commands - this is a _conceptual_ discussion (so the reader shouldn't wonder why he doesn't understand what actually do to rebase his branch). Thank again Urs -- Urs Liska openlilylib.org |
From: Joshua N. <jos...@gm...> - 2014-01-11 17:44:08
|
> > md, I believe, is markdown - a simpler version of HTML MarkUp (geddit?). Indeed, I am using "StackEdit" which is a dummy text editor for MarkDown. It's useful, and it allows to send off to GitHub. I'm looking at all of this, and I feel overwhelmed too; I am just taking it one bite at a time. IC, Josh On Sat, Jan 11, 2014 at 11:00 AM, Phil Holmes <ma...@ph...> wrote: > ----- Original Message ----- > From: "David Webber" <da...@mu...> > To: "oll-user" <ope...@li...> > Sent: Saturday, January 11, 2014 4:45 PM > Subject: Re: [oll-user] Git for dummies > > > > From: Phil Holmes > > > >>> OK thanks. Done all that! Can you see a pdf and a png file from me? > > > >> Yep. Welcome to git. > > > > I'm now babbling incoherently wondering where I am. How did you see > > them? > > I went to _your_ repository: > https://github.com/MozartSoftware/engraving-challenges > > At present, you can only update your own repositiry, since you don't have > permission to mess with Urs's original. I think he may be able to grab > stuff from you and upload it to his repo, but I'll leave that to him. > > > There's something which says branch:master, but if I change it to another > > 'branch' I see the same thing. > > A quick divert into branches. These are effectively parallel development > streams (which can also be merged if required). So if you were working on > 2 > versions of a piece of music (I dunno, baroque and modern styles or > something) you could create a branch for each and swap between them, > without > either impinging on the other. If you look at the lilypond git interface > you'll see _lots_ of branches - this is to allow us to work on separate > aspects/timelines of the system without bothering the others. Broadly, you > can get away without doing much about branches at this time. > > > PS > > [In a spectacular leap of the imagination I have just realised that .md > > files are probably ascii text, so I'm going to try to modify the one in > > Mozart.] > > md, I believe, is markdown - a simpler version of HTML MarkUp (geddit?). > > -- > Phil Holmes > > > > ------------------------------------------------------------------------------ > CenturyLink Cloud: The Leader in Enterprise Cloud Services. > Learn Why More Businesses Are Choosing CenturyLink Cloud For > Critical Workloads, Development Environments & Everything In Between. > Get a Quote or Start a Free Trial Today. > > http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk > _______________________________________________ > openlilylib-user mailing list > ope...@li... > https://lists.sourceforge.net/lists/listinfo/openlilylib-user > -------------- next part -------------- An HTML attachment was scrubbed... |
From: Marc S. <ma...@ou...> - 2014-01-11 17:09:06
|
On 1/10/2014 5:56 PM, Urs Liska wrote: > before you should do: > > Git checkout 2-schumann-challenge > Git fetch upstream > Git rebase upstream/master > Git checkout musescore > Git rebase 2-schumann > > (Everything with lowercase at the beginning) > > Then make sure to open the request against openlilylib/2-schumann-challenge. This is *almost* but not quite what I figured out on my own. In the third step above, I did the rebase against upstream/2-schumann-challenge instead of upstream/master - basically, I did a global replace of everywhere I normally would have used "master", changing it to 2-schumann-challenge. And I assume your fifth step above is a typo and should have been a 2-schumann-challenge. I'm still green enough with Git to not be able to figure out for myself what the difference between "git rebase upstream/master" and "git rebase upstream/2-schumann-challenge" is in this context. Did I screw things up badly enough that I need to redo all this, or if the pull request usable as is? Anyhow, this whole series of step - including instructions on how to open a PR against a branch (since it seems to default to master) should probably go in the workflow document. Marc |
From: Phil H. <ma...@ph...> - 2014-01-11 17:01:00
|
----- Original Message ----- From: "David Webber" <da...@mu...> To: "oll-user" <ope...@li...> Sent: Saturday, January 11, 2014 4:45 PM Subject: Re: [oll-user] Git for dummies > From: Phil Holmes > >>> OK thanks. Done all that! Can you see a pdf and a png file from me? > >> Yep. Welcome to git. > > I'm now babbling incoherently wondering where I am. How did you see > them? I went to _your_ repository: https://github.com/MozartSoftware/engraving-challenges At present, you can only update your own repositiry, since you don't have permission to mess with Urs's original. I think he may be able to grab stuff from you and upload it to his repo, but I'll leave that to him. > There's something which says branch:master, but if I change it to another > 'branch' I see the same thing. A quick divert into branches. These are effectively parallel development streams (which can also be merged if required). So if you were working on 2 versions of a piece of music (I dunno, baroque and modern styles or something) you could create a branch for each and swap between them, without either impinging on the other. If you look at the lilypond git interface you'll see _lots_ of branches - this is to allow us to work on separate aspects/timelines of the system without bothering the others. Broadly, you can get away without doing much about branches at this time. > PS > [In a spectacular leap of the imagination I have just realised that .md > files are probably ascii text, so I'm going to try to modify the one in > Mozart.] md, I believe, is markdown - a simpler version of HTML MarkUp (geddit?). -- Phil Holmes |
From: Marc S. <ma...@ou...> - 2014-01-11 17:00:54
|
I'd like to step back and say a few things about the "big picture" here. There are any number of "Git for dummies" tutorials out there that you should should probably spend some time with, but having gone through this pain myself recently with MuseScore, I can tell you the devil is as likely to be in the details as in the concepts, because every project structures things differently. Ideally, we'd all come to this (or any project) with a basic handle on how Git works from the various tutorials that float around out there, and the project would provide a "Git workflow" document that detailed the specifics in a manner that would be clear enough to anyone with a basic familiarity with Git. I think the current Git workflow document we have here is a start, but doesn't go far enough, so maybe we need to work on that. First, though, here's my bare bones and probably a bit naive nutshell description of Git as it applies to GitHub-based projects specifically: A project has a main repository (repo) stored on GitHub that is the one we are referring to as "upstream". This one you will *read* from (via "git fetch upstream") whenever you need to get updated files contributed by others. You will never probably write to this directly. When you first join a project, you start by creating a "fork" of that repo, which creates your own personal copy of that upstream. Your fork - which we are calling "origin" - is *also* stored on GitHub, and this is what you will *write* to (via "git push") when you want to make your work available to others. After pushing to your fork, you then issue a "pull request" to the owner of the upstream repo that says "I have pushed changes to my fork, please merge them into the upstream repo". That is how your changes become available to others, and how their changes become available to you - by being merged into the upstream repo. All of this is on GitHub. You will work, of course, on your own computer. So you do a "git clone" of your fork, which creates a local copy of everything. This is your own personal sandbox; you play with these files however you like, including adding new ones. Every so often, you decide things are at a state where you want to take a snapshot of your current sandbox. You do this via "git commit". After one or more of these commits, you might decide you are at a point where you feel these should be written to your fork on GitHub, so you do as "git push". After one or more of these pushes, you might decide your work is ready to be shared with others, so you issue a "pull request" (that is done on GitHub). Every so often, you will also decide it would be good to grab the work others have been contributing. So you do a "git fetch upstream". Because of the details of how git manages version control, you have to also do a "git rebase" to fully incorporate their changes into your sandbox (this is the step hardest to fully grasp, I find). At that point, you can in principle continue working, do more commits, more pushes, and pull requests, and the cycle continues. That's the overall flow of this and other projects that use GitHub. When you read the various Git tutorials out there, you won't see much talk of forks and pull requests - that's more of a GitHub-specific thing, I guess. The Git tutorials focus mostly on branching, which I didn't even mention here. Because that's when you start getting into the details different projects handle differently, and where I think the workflow document for this project could stand to spell things out in more detail. Anyhow, I hope this helps. Marc |
From: Urs L. <ul...@op...> - 2014-01-11 17:00:12
|
Am 11.01.2014 17:45, schrieb David Webber: > From: Phil Holmes > >>> OK thanks. Done all that! Can you see a pdf and a png file from me? > >> Yep. Welcome to git. > > I'm now babbling incoherently wondering where I am. How did you see them? > > I looked at Urs's original link > > https://github.com/openlilylib/engraving-challenges/tree/master/challenge01 > > I see a list of folders. I open the Mozart folder and see only README.md > with a dummy message in it. > > There's something which says branch:master, but if I change it to another > 'branch' I see the same thing. > > I note that there's a phil-sib-music branch but not a mozart branch. If I > go to the challenge01/Sibelius-7 with the branch set to phil-sib-music, then > there's a phil directory with your pdf in there- a first draft. > > But I can't see my stuff????? > > How do I see what's there? You have to look in your own account (i.e. your _fork_ of the repository). Good luck Urs PS: If that's really untweaked input it looks _very_ good so far! > > Dave > > David Webber > Mozart Music Software > http://www.mozart.co.uk/ > > PS > [In a spectacular leap of the imagination I have just realised that .md > files are probably ascii text, so I'm going to try to modify the one in > Mozart.] > > > > ------------------------------------------------------------------------------ > CenturyLink Cloud: The Leader in Enterprise Cloud Services. > Learn Why More Businesses Are Choosing CenturyLink Cloud For > Critical Workloads, Development Environments & Everything In Between. > Get a Quote or Start a Free Trial Today. > http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk > _______________________________________________ > openlilylib-user mailing list > ope...@li... > https://lists.sourceforge.net/lists/listinfo/openlilylib-user > -- Urs Liska www.openlilylib.org |
From: Janek W. <lem...@gm...> - 2014-01-11 16:59:42
|
2014/1/11 David Webber <da...@mu...> > From: Phil Holmes > > >> OK thanks. Done all that! Can you see a pdf and a png file from me? > > > Yep. Welcome to git. > > I'm now babbling incoherently wondering where I am. How did you see > them? > > I looked at Urs's original link > > https://github.com/openlilylib/engraving-challenges/tree/master/challenge01 > > I see a list of folders. I open the Mozart folder and see only README.md > with a dummy message in it. > > There's something which says branch:master, but if I change it to another > 'branch' I see the same thing. > > I note that there's a phil-sib-music branch but not a mozart branch. If I > go to the challenge01/Sibelius-7 with the branch set to phil-sib-music, > then > there's a phil directory with your pdf in there- a first draft. > > But I can't see my stuff????? > > How do I see what's there? > It was pushed to your fork ( https://github.com/MozartSoftware/engraving-challenges), not the 'original' repository (usually called 'upstream' in git terminology), i.e. not to https://github.com/openlilylib/engraving-challenges/<https://github.com/openlilylib/engraving-challenges/tree/master/challenge01> But that's actually what we want. -------------- next part -------------- An HTML attachment was scrubbed... |
From: Janek W. <lem...@gm...> - 2014-01-11 16:57:24
|
2014/1/11 Phil Holmes <ma...@ph...> > > > and I've already blundered. I created a directory called > > .../engraving-challenges and went there. The files are now all a > > directory > > > > .../engraving-challenges/engraving-challenges/ > > > > but I suppose I can live with that for now. > > I pretty much always do that :-( > Yeah, git assumes you want to create a new directory with the repository's name if you don't tell it otherwise. You can specify the path where the cloned repository should be put, like this: git clone https://github.com/blahblah/blahblahpath/where/the/stuff/should/be/put This way you don't even have to be in the directory were the clone will be placed (the directory may not even exist yet). > >> Lunch beckons: let me know when you've done that. > > > > Yes! I see I have a directory > > .../engraving-challenges/engraving-challenges/challenge01/Mozart > > You should also see a number of other directories and files, for example > > engraving-challenges\challenge01\ chopin-godowsky.png > > (this was with Windows explorer for me - hence the \ / confusion. > > > Presumably I can put files there??? How do I upload them? > > Yes, you can put files into the Mozart directory, and git will recognise > them there (probably). git status will give you an idea of what's doing > a bit of git advice: git status is your best friend. I used to run it literally before and after every other command, until i learned enough that i always knew what it will tell me. > There's one gotcha here: git has a list of filetypes it ignores in the > .gitignore file, > and by default .pdf is on this list - so if you're wanting to track and > upload PDFs you'll need to edit .gitignore and get rid of the pdf entry. > This may not be a good idea: the .gitignore is part of the repository (git actually tracks it). You should rather add the file explicitely, i.e. 'git add filename' (without using wildcards). > OK - we've added *.png to the list of files being tracked: we now need to > tell git to take a snapshot of the current situation. We do this with a > commit: > > git commit -am 'Commit message' > > a=all files; m=use this message. > a slight clarification: -a is "all tracked files". It won't commit untracked files if you haven't manually added them. best, Janek -------------- next part -------------- An HTML attachment was scrubbed... |
From: David W. <da...@mu...> - 2014-01-11 16:47:32
|
From: Phil Holmes >> OK thanks. Done all that! Can you see a pdf and a png file from me? > Yep. Welcome to git. I'm now babbling incoherently wondering where I am. How did you see them? I looked at Urs's original link https://github.com/openlilylib/engraving-challenges/tree/master/challenge01 I see a list of folders. I open the Mozart folder and see only README.md with a dummy message in it. There's something which says branch:master, but if I change it to another 'branch' I see the same thing. I note that there's a phil-sib-music branch but not a mozart branch. If I go to the challenge01/Sibelius-7 with the branch set to phil-sib-music, then there's a phil directory with your pdf in there- a first draft. But I can't see my stuff????? How do I see what's there? Dave David Webber Mozart Music Software http://www.mozart.co.uk/ PS [In a spectacular leap of the imagination I have just realised that .md files are probably ascii text, so I'm going to try to modify the one in Mozart.] |
From: Shane B. <sh...@gr...> - 2014-01-11 16:42:32
|
Thanks Phil, I suspected that might be the way forward but could not work out the list part from the example on the snippet repository. regards, Shane On Sat, Jan 11, 2014 at 10:08 AM, Phil Holmes <em...@ph...> wrote: > Try this (the second group is an exercise for the student) > > \version "2.18.0" > > \new Voice \with { \remove "Tuplet_engraver" } > { > \relative c' { > \set Timing.beamExceptions = #'() > \set subdivideBeams = ##t > \set baseMoment = #(ly:make-moment 1/6) > \set beatStructure = #'( 3 3 ) > \tuplet 3/2 { > c16 c c c c > \once \override Stem.beaming = #(cons (list 1 0) (list 1)) > c > \once \override Stem.beaming = #(cons (list 0) (list -1 0)) > c c c c c c c c c c c c c c c c c c | > } > f1 > } > } > > > > -- > Phil Holmes > > > > ------------------------------------------------------------------------------ > CenturyLink Cloud: The Leader in Enterprise Cloud Services. > Learn Why More Businesses Are Choosing CenturyLink Cloud For > Critical Workloads, Development Environments & Everything In Between. > Get a Quote or Start a Free Trial Today. > http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk > _______________________________________________ > openlilylib-user mailing list > ope...@li... > https://lists.sourceforge.net/lists/listinfo/openlilylib-user |
From: Phil H. <ma...@ph...> - 2014-01-11 16:18:02
|
----- Original Message ----- From: "David Webber" <da...@mu...> To: "oll-user" <ope...@li...> Sent: Saturday, January 11, 2014 3:59 PM Subject: Re: [oll-user] Git for dummies > OK thanks. Done all that! Can you see a pdf and a png file from me? > > Dave > > David Webber > Mozart Music Software > http://www.mozart.co.uk/ Yep. Welcome to git. -- Phil Holmes |
From: David W. <da...@mu...> - 2014-01-11 16:00:09
|
OK thanks. Done all that! Can you see a pdf and a png file from me? Dave David Webber Mozart Music Software http://www.mozart.co.uk/ -----Original Message----- From: Phil Holmes Sent: Saturday, January 11, 2014 3:27 PM To: David Webber ; oll-user Subject: Re: [oll-user] Git for dummies ----- Original Message ----- From: "David Webber" <da...@mu...> To: "oll-user" <ope...@li...> Sent: Saturday, January 11, 2014 3:07 PM Subject: Re: [oll-user] Git for dummies > From: Phil Holmes > >>{GitBash] >> With your permission, I'll focus on this, since I'm not familiar with the > Gui. FWIW I regard myself as a Windows power user, but since getting > involved in LilyPond I've had to adopt some Linux, to the point now where > I > sometimes type 'ls' into a Windows command prompt, where I should use > 'dir'.< > > OK, so reading between the lines, GitBash is a unix shell of some kind. I > now have to drag microemacs out of the recesses of my memory. I used it > as > my C++ editor up to the mid 90s, and this is the only unix-style command > prompt I've ever used. Still GitBash seems to like my first attempts at > ls, pwd, mkdir, and cd, so I'm starting to feel that it is my friend :-) I guess it's a Unix-xtyle DOS shell, really. As I said, I now get confused between ls and dir. > So I've created my local engraving-challenges directory, navigated to it, > and done > > git clone https://github.com/MozartSoftware/engraving-challenges > > (DavidWebber is apparently a common name and I had to choose another ID). > >> You should see some stuff happening > > Stuff indeed happened, > >> and you should get a copy of the files from the remote repo on your hard >> disk. > > and I've already blundered. I created a directory called > .../engraving-challenges and went there. The files are now all a > directory > > .../engraving-challenges/engraving-challenges/ > > but I suppose I can live with that for now. I pretty much always do that :-( >> Lunch beckons: let me know when you've done that. > > Yes! I see I have a directory > .../engraving-challenges/engraving-challenges/challenge01/Mozart You should also see a number of other directories and files, for example engraving-challenges\challenge01\ chopin-godowsky.png (this was with Windows explorer for me - hence the \ / confusion. > Presumably I can put files there??? How do I upload them? Yes, you can put files into the Mozart directory, and git will recognise them there (probably). git status will give you an idea of what's doing $ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: Estrella.sib # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # ../../challenge01/Sibelius-7/V1 - Full Score.pdf # ../../challenge01/Sibelius-7/V1_Bar4.sib # ../../challenge01/Sibelius-7/V1_Bar5.sib # ../../challenge01/Sibelius-7/V1_Complete - Full Score - Copy.pdf # Beaming.ly # Beaming.pdf # Notes.txt no changes added to commit (use "git add" and/or "git commit -a") So I see that I'm on branch master (back to this in a minute). I have one file that git is tracking that I've modified, plus a number of files that git is aware of, but is not tracking. So you should see the files you've copied to that directory in the "Untracked files" list. So, to get git to track them, we do: git add filename wildcards also work for filename, so git add *.png would work. There's one gotcha here: git has a list of filetypes it ignores in the .gitignore file, and by default .pdf is on this list - so if you're wanting to track and upload PDFs you'll need to edit .gitignore and get rid of the pdf entry. OK - we've added *.png to the list of files being tracked: we now need to tell git to take a snapshot of the current situation. We do this with a commit: git commit -am 'Commit message' a=all files; m=use this message. All other things being equal, you should be able to see what's there with gitk: this should open a GUI window and give a representation of what's going on. You'll need to close it to get the command prompt usable again. All that's now needed is to actually do the upload: git push You will be prompted for (your github) username and password. This should push your commit to the remote github server. This simple push syntax works fine on github, but if you get into more complex repositories, there are other options that will need taking care of. Think that should do for now. Summary: new files are added with git add; changes are snapshotted with git commit; changes are uploaded with git push. Once this is all OK, we can think about branches. -- Phil Holmes |
From: Phil H. <ma...@ph...> - 2014-01-11 15:27:57
|
----- Original Message ----- From: "David Webber" <da...@mu...> To: "oll-user" <ope...@li...> Sent: Saturday, January 11, 2014 3:07 PM Subject: Re: [oll-user] Git for dummies > From: Phil Holmes > >>{GitBash] >> With your permission, I'll focus on this, since I'm not familiar with the > Gui. FWIW I regard myself as a Windows power user, but since getting > involved in LilyPond I've had to adopt some Linux, to the point now where > I > sometimes type 'ls' into a Windows command prompt, where I should use > 'dir'.< > > OK, so reading between the lines, GitBash is a unix shell of some kind. > I > now have to drag microemacs out of the recesses of my memory. I used it > as > my C++ editor up to the mid 90s, and this is the only unix-style command > prompt I've ever used. Still GitBash seems to like my first attempts at > ls, pwd, mkdir, and cd, so I'm starting to feel that it is my friend :-) I guess it's a Unix-xtyle DOS shell, really. As I said, I now get confused between ls and dir. > So I've created my local engraving-challenges directory, navigated to it, > and done > > git clone https://github.com/MozartSoftware/engraving-challenges > > (DavidWebber is apparently a common name and I had to choose another ID). > >> You should see some stuff happening > > Stuff indeed happened, > >> and you should get a copy of the files from the remote repo on your hard >> disk. > > and I've already blundered. I created a directory called > .../engraving-challenges and went there. The files are now all a > directory > > .../engraving-challenges/engraving-challenges/ > > but I suppose I can live with that for now. I pretty much always do that :-( >> Lunch beckons: let me know when you've done that. > > Yes! I see I have a directory > .../engraving-challenges/engraving-challenges/challenge01/Mozart You should also see a number of other directories and files, for example engraving-challenges\challenge01\ chopin-godowsky.png (this was with Windows explorer for me - hence the \ / confusion. > Presumably I can put files there??? How do I upload them? Yes, you can put files into the Mozart directory, and git will recognise them there (probably). git status will give you an idea of what's doing $ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: Estrella.sib # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # ../../challenge01/Sibelius-7/V1 - Full Score.pdf # ../../challenge01/Sibelius-7/V1_Bar4.sib # ../../challenge01/Sibelius-7/V1_Bar5.sib # ../../challenge01/Sibelius-7/V1_Complete - Full Score - Copy.pdf # Beaming.ly # Beaming.pdf # Notes.txt no changes added to commit (use "git add" and/or "git commit -a") So I see that I'm on branch master (back to this in a minute). I have one file that git is tracking that I've modified, plus a number of files that git is aware of, but is not tracking. So you should see the files you've copied to that directory in the "Untracked files" list. So, to get git to track them, we do: git add filename wildcards also work for filename, so git add *.png would work. There's one gotcha here: git has a list of filetypes it ignores in the .gitignore file, and by default .pdf is on this list - so if you're wanting to track and upload PDFs you'll need to edit .gitignore and get rid of the pdf entry. OK - we've added *.png to the list of files being tracked: we now need to tell git to take a snapshot of the current situation. We do this with a commit: git commit -am 'Commit message' a=all files; m=use this message. All other things being equal, you should be able to see what's there with gitk: this should open a GUI window and give a representation of what's going on. You'll need to close it to get the command prompt usable again. All that's now needed is to actually do the upload: git push You will be prompted for (your github) username and password. This should push your commit to the remote github server. This simple push syntax works fine on github, but if you get into more complex repositories, there are other options that will need taking care of. Think that should do for now. Summary: new files are added with git add; changes are snapshotted with git commit; changes are uploaded with git push. Once this is all OK, we can think about branches. -- Phil Holmes |
From: Phil H. <em...@ph...> - 2014-01-11 15:08:59
|
Try this (the second group is an exercise for the student) \version "2.18.0" \new Voice \with { \remove "Tuplet_engraver" } { \relative c' { \set Timing.beamExceptions = #'() \set subdivideBeams = ##t \set baseMoment = #(ly:make-moment 1/6) \set beatStructure = #'( 3 3 ) \tuplet 3/2 { c16 c c c c \once \override Stem.beaming = #(cons (list 1 0) (list 1)) c \once \override Stem.beaming = #(cons (list 0) (list -1 0)) c c c c c c c c c c c c c c c c c c | } f1 } } -- Phil Holmes |
From: David W. <da...@mu...> - 2014-01-11 15:07:36
|
From: Phil Holmes >{GitBash] > With your permission, I'll focus on this, since I'm not familiar with the Gui. FWIW I regard myself as a Windows power user, but since getting involved in LilyPond I've had to adopt some Linux, to the point now where I sometimes type 'ls' into a Windows command prompt, where I should use 'dir'.< OK, so reading between the lines, GitBash is a unix shell of some kind. I now have to drag microemacs out of the recesses of my memory. I used it as my C++ editor up to the mid 90s, and this is the only unix-style command prompt I've ever used. Still GitBash seems to like my first attempts at ls, pwd, mkdir, and cd, so I'm starting to feel that it is my friend :-) So I've created my local engraving-challenges directory, navigated to it, and done git clone https://github.com/MozartSoftware/engraving-challenges (DavidWebber is apparently a common name and I had to choose another ID). > You should see some stuff happening Stuff indeed happened, > and you should get a copy of the files from the remote repo on your hard > disk. and I've already blundered. I created a directory called .../engraving-challenges and went there. The files are now all a directory .../engraving-challenges/engraving-challenges/ but I suppose I can live with that for now. > Lunch beckons: let me know when you've done that. Yes! I see I have a directory .../engraving-challenges/engraving-challenges/challenge01/Mozart Presumably I can put files there??? How do I upload them? Dave David Webber Mozart Music Software http://www.mozart.co.uk/ |
From: Phil H. <ma...@ph...> - 2014-01-11 13:49:11
|
----- Original Message ----- From: "David Webber" <da...@mu...> To: <ope...@li...> Sent: Saturday, January 11, 2014 1:28 PM Subject: Re: [oll-user] Git for dummies > From: Phil Holmes > >> I'm assuming you have a github account? > > Yes. With a user name and password. > >> When you "fork"ed the engraving > challenge, it would have copied the files from that page (repository == > repo) to your account, so you should now have a copy in your account.< > > OK - thanks - I had no idea that's what it did! > >>When you installed git for Windows, it should have given you a new git > program in your programs. I'm Vista, so can't say exactly how this > manifests in Win 8, but in Vista I have a Program folder called Git, and > programs called git bash and git gui. Do you have something similar? > > Yes. I actually installed two things. > > A) GitBash: seems to be a command line program, and the commands are of > the > form, I guess, that others have asked about here. But without an adequate > mental model of exactly what the commands are supposed to achieve, or what > is going where, the syntax just looks like a set of uncertain magic > incantations. (I have never used Linux, and command lines just give me > nostalgia for MS-DOS which I used back in the 1980s.) With your permission, I'll focus on this, since I'm not familiar with the Gui. FWIW I regard myself as a Windows power user, but since getting involved in LilyPond I've had to adopt some Linux, to the point now where I sometimes type 'ls' into a Windows command prompt, where I should use 'dir'. Anyway, conceptually git provides a distributed repository of files. The original was on Urs's account, and you copied this (fork) to your github account. You can now pull this down to your local machine, mess with the files and git will track this. You can then make these changes a part of the repo (commit) and get them back up to the repository on github (push). There's loads of other commands, most of which I don't know, but the few I do know should get you started. You need to start by creating the repository locally. Open the bash prompt and navigate to, or create, the directory where you want your local repository to reside. Then clone the repo from remote. I would do this with: git clone https://github.com/PhilHolmes/engraving-challenges You need to use your own username in the URL. You should see some stuff happening and you should get a copy of the files from the remote repo on your hard disk. Lunch beckons: let me know when you've done that. [snip] -- Phil Holmes |
From: Urs L. <ul...@op...> - 2014-01-11 13:44:51
|
David Webber <da...@mu...> schrieb: >From: Phil Holmes > >> I'm assuming you have a github account? > >Yes. With a user name and password. > >> When you "fork"ed the engraving >challenge, it would have copied the files from that page (repository == >repo) to your account, so you should now have a copy in your account.< > >OK - thanks - I had no idea that's what it did! > >>When you installed git for Windows, it should have given you a new git >program in your programs. I'm Vista, so can't say exactly how this >manifests in Win 8, but in Vista I have a Program folder called Git, >and >programs called git bash and git gui. Do you have something similar? > >Yes. I actually installed two things. > >A) GitBash: seems to be a command line program, and the commands are >of the >form, I guess, that others have asked about here. But without an >adequate >mental model of exactly what the commands are supposed to achieve, or >what >is going where, the syntax just looks like a set of uncertain magic >incantations. (I have never used Linux, and command lines just give me > >nostalgia for MS-DOS which I used back in the 1980s.) > >B) Git for Windows: I thought this would bypass the command syntax, >but the >lack of a mental model is confusing me here too. In addition to >GitBash, I >have two icons on my desktop: > >B1. GitShell (white pussycat silhouette on a black disk). >This opens "Windows Power Shell" which looks like a posh version of >GitBash. > >B2. GitHub (white pussycat silhouette on a blue disk). > >This opens a GUI app. Down the left it has Local then repositories, >then >GitHub, then my user ID. Next to the local repositories I have one >entry: >"PhilHolmes/engraving-challenges". I can only assume that this is >there >because I looked at one of your PDFs? I can open this and see two >PDFs -one for each challenge: presumably yours! > >There's also a "drag a repository here to add" area. But where from? >And >what does it add it to? > >If I click on my ID under GitHub, the local repository changes to show >the >name of mine! And there's a 'clone' button next to it. Do I do that? > If >so, what next? > >Thanks Phil. If you can sort me out, this might be a life saver! > >Dave > >David Webber >Mozart Music Software >http://www.mozart.co.uk/ > > > > > >------------------------------------------------------------------------------ >CenturyLink Cloud: The Leader in Enterprise Cloud Services. >Learn Why More Businesses Are Choosing CenturyLink Cloud For >Critical Workloads, Development Environments & Everything In Between. >Get a Quote or Start a Free Trial Today. >http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk >_______________________________________________ >openlilylib-user mailing list >ope...@li... >https://lists.sourceforge.net/lists/listinfo/openlilylib-user Just a quick comment (I'm only on my mobile today): Github for Windows hides the "mental model" in a way that I find quite suspicious. And you're right, getting the mental model of how this all works is crucial. But as mysterious as it looks, it isn't that hard, at least for everything we need now. -- Urs Liska openlilylib.org |
From: David W. <da...@mu...> - 2014-01-11 13:29:51
|
From: Phil Holmes > I'm assuming you have a github account? Yes. With a user name and password. > When you "fork"ed the engraving challenge, it would have copied the files from that page (repository == repo) to your account, so you should now have a copy in your account.< OK - thanks - I had no idea that's what it did! >When you installed git for Windows, it should have given you a new git program in your programs. I'm Vista, so can't say exactly how this manifests in Win 8, but in Vista I have a Program folder called Git, and programs called git bash and git gui. Do you have something similar? Yes. I actually installed two things. A) GitBash: seems to be a command line program, and the commands are of the form, I guess, that others have asked about here. But without an adequate mental model of exactly what the commands are supposed to achieve, or what is going where, the syntax just looks like a set of uncertain magic incantations. (I have never used Linux, and command lines just give me nostalgia for MS-DOS which I used back in the 1980s.) B) Git for Windows: I thought this would bypass the command syntax, but the lack of a mental model is confusing me here too. In addition to GitBash, I have two icons on my desktop: B1. GitShell (white pussycat silhouette on a black disk). This opens "Windows Power Shell" which looks like a posh version of GitBash. B2. GitHub (white pussycat silhouette on a blue disk). This opens a GUI app. Down the left it has Local then repositories, then GitHub, then my user ID. Next to the local repositories I have one entry: "PhilHolmes/engraving-challenges". I can only assume that this is there because I looked at one of your PDFs? I can open this and see two PDFs -one for each challenge: presumably yours! There's also a "drag a repository here to add" area. But where from? And what does it add it to? If I click on my ID under GitHub, the local repository changes to show the name of mine! And there's a 'clone' button next to it. Do I do that? If so, what next? Thanks Phil. If you can sort me out, this might be a life saver! Dave David Webber Mozart Music Software http://www.mozart.co.uk/ |
From: Phil H. <ma...@ph...> - 2014-01-11 12:59:35
|
----- Original Message ----- From: "David Webber" <da...@mu...> To: <ope...@li...> Sent: Saturday, January 11, 2014 12:41 PM Subject: [oll-user] Git for dummies >I am coming to GIT with zero background knowledge, and am absolutely >*totally* confused. > > I have installed GIT and GIT for windows (I’m running Windows 8), and can > log on with my user name and password. I pressed a ‘Fork’ button in the > browser page, and the number next to it responded by changing from 7 to 8. > > But I don’t know what this actually did, and I haven’t a clue what to do > next. I have a PDF file to upload, or ‘commit’ or whatever, but how do I > do it? I have to ‘clone’ a ‘repository’ but I have only the faintest idea > of what a ‘repository’ is or what a ‘clone’ is (except possibly that the > clone is possibly expected to be on my computer, and the repository is up > in the cloud somewhere). > > I started wading through the introduction to GIT but after several > generally unhelpful pages of how it differs from other programs I’d never > heard of, my eyes started to glaze over. I have now spent almost as long > on this as I spent encoding challenge 1. > > Help! Anyone? > I'm assuming you have a github account? When you "fork"ed the engraving challenge, it would have copied the files from that page (repository == repo) to your account, so you should now have a copy in your account. When you installed git for Windows, it should have given you a new git program in your programs. I'm Vista, so can't say exactly how this manifests in Win 8, but in Vista I have a Program folder called Git, and programs called git bash and git gui. Do you have something similar? If so, we can proceed from there. -- Phil Holmes |