Re: CM 1.1 git question

2009-02-20 Thread Trevor Daniels
Jonathan, you wrote Thursday, February 19, 2009 12:16 PM Trevor Daniels wrote: Jon, the recent patch I pushed for you (lsr-work.patch) was sent using Thunderbird but, as it was attached, the line endings were correctly Unix (LF only). It did have white space at the end of most (every,

Re: CM 1.1 git question

2009-02-20 Thread Jonathan Kulp
Trevor Daniels wrote: More seriously, the patch doesn't apply here because your line numbering seems to be 1 off from the line numbers I have in git-starting.itexi. I have no idea why that should be. I believe my git repo is fully synch'ed with origin/master, and according to your description

Re: CM 1.1 git question

2009-02-20 Thread Johannes Schindelin
Hi, On Fri, 20 Feb 2009, Jonathan Kulp wrote: Trevor Daniels wrote: More seriously, the patch doesn't apply here because your line numbering seems to be 1 off from the line numbers I have in git-starting.itexi. I have no idea why that should be. I believe my git repo is fully

Re: CM 1.1 git question

2009-02-20 Thread Graham Percival
On Fri, Feb 20, 2009 at 08:09:21AM -0600, Jonathan Kulp wrote: Is this right? I surmise that this pulls down more code than strictly necessary for working on docs, but I don't mind having the extra code. Maybe I should delete the whole directory and do a fresh clone. Don't do a clone;

Re: CM 1.1 git question

2009-02-20 Thread Graham Percival
On Fri, Feb 20, 2009 at 08:09:21AM -0600, Jonathan Kulp wrote: Is this right? I surmise that this pulls down more code than strictly necessary for working on docs, but I don't mind having the extra code. Maybe I should delete the whole directory and do a fresh clone. Oh, I forgot to

Re: CM 1.1 git question

2009-02-20 Thread Jonathan Kulp
Johannes Schindelin wrote: No need to reclone. Just rename the current branch: $ git branch -m old.branch This part seemed to work fine. And then start anew (in the same repository!): $ git checkout -t origin/web (You need to adjust the web to the appropriate branch

Re: CM 1.1 git question

2009-02-20 Thread Jonathan Kulp
Graham Percival wrote: On Fri, Feb 20, 2009 at 08:09:21AM -0600, Jonathan Kulp wrote: Is this right? I surmise that this pulls down more code than strictly necessary for working on docs, but I don't mind having the extra code. Maybe I should delete the whole directory and do a fresh clone.

Re: CM 1.1 git question

2009-02-20 Thread Johannes Schindelin
Hi, On Fri, 20 Feb 2009, Jonathan Kulp wrote: Johannes Schindelin wrote: No need to reclone. Just rename the current branch: $ git branch -m old.branch This part seemed to work fine. And then start anew (in the same repository!): $ git checkout -t origin/web (You

Re: CM 1.1 git question

2009-02-20 Thread Jonathan Kulp
Johannes Schindelin wrote: --track ? That probably means that you have an older Git than I have (I am always on the bleeding edge). In that case, you might need to use $ git checkout --track -b web origin/web (Newer Git assumes that checkout -t origin/web is a shortcut for this

Re: CM 1.1 git question

2009-02-20 Thread Trevor Daniels
Jonathan Kulp wrote Friday, February 20, 2009 2:58 PM Graham Percival wrote: On Fri, Feb 20, 2009 at 08:09:21AM -0600, Jonathan Kulp wrote: Is this right? I surmise that this pulls down more code than strictly necessary for working on docs, but I don't mind having the extra code. Maybe I

Re: CM 1.1 git question

2009-02-20 Thread Jonathan Kulp
Trevor Daniels wrote: Jonathan Kulp wrote Friday, February 20, 2009 2:58 PM You have removed all the whitespace, but the lines still have Windows line terminations (CR-LF). I fixed that, but I'm afraid it still doesn't apply. I honestly don't know whether the problem is at my end or yours.

Re: CM 1.1 git question

2009-02-19 Thread Trevor Daniels
Jonathan Kulp wrote Wednesday, February 18, 2009 10:04 PM Johannes Schindelin wrote: Hi, On Wed, 18 Feb 2009, Jonathan Kulp wrote: I realized after I sent it, though, that I sent it from my Thunderbird email client and this historically has jacked up the line endings. We had a very

Re: CM 1.1 git question

2009-02-19 Thread Jonathan Kulp
Trevor Daniels wrote: Jon, the recent patch I pushed for you (lsr-work.patch) was sent using Thunderbird but, as it was attached, the line endings were correctly Unix (LF only). It did have white space at the end of most (every, maybe) lines, but this is easily fixed - I routinely check and

Re: CM 1.1 git question

2009-02-19 Thread Jonathan Kulp
Trevor Daniels wrote: Jon, the recent patch I pushed for you (lsr-work.patch) was sent using Thunderbird but, as it was attached, the line endings were correctly Unix (LF only). It did have white space at the end of most (every, maybe) lines, but this is easily fixed - I routinely check and

Re: CM 1.1 git question

2009-02-19 Thread Maximilian Albert
2009/2/18 Jonathan Kulp jonlancek...@gmail.com: Ok I found a typo in the git instructions of CG and followed your instructions to create the patch using git. Seems to have worked great! I remember the times when I was still feeling uncomfortable with git. The thing is that when you are used to

Re: CM 1.1 git question

2009-02-19 Thread Jonathan Kulp
Maximilian Albert wrote: 2009/2/18 Jonathan Kulp jonlancek...@gmail.com: Ok I found a typo in the git instructions of CG and followed your instructions to create the patch using git. Seems to have worked great! I remember the times when I was still feeling uncomfortable with git. The thing

Re: CM 1.1 git question

2009-02-19 Thread Jonathan Kulp
Jonathan Kulp wrote: This sounds really useful. I'd like to try to get comfortable with git on a project of my own, something that doesn't have an online repo. How do I create a local git version of a directory on my machine? I tried creating a new directory to house the new git repo and

Re: CM 1.1 git question

2009-02-19 Thread Maximilian Albert
2009/2/19 Jonathan Kulp jonlancek...@gmail.com: I'd like to try to get comfortable with git on a project of my own, something that doesn't have an online repo. How do I create a local git version of a directory on my machine? Just for the record (perhaps someone else is interested, too) -

Re: CM 1.1 git question

2009-02-19 Thread Carl D. Sorensen
Yes, set your editor to strip trailing spaces, and I think you'll be good. Carl On 2/19/09 8:17 AM, Jonathan Kulp jonlancek...@gmail.com wrote: Trevor Daniels wrote: Jon, the recent patch I pushed for you (lsr-work.patch) was sent using Thunderbird but, as it was attached, the line

Re: CM 1.1 git question

2009-02-19 Thread Carl D. Sorensen
On 2/19/09 9:53 AM, Jonathan Kulp jonlancek...@gmail.com wrote: This sounds really useful. I'd like to try to get comfortable with git on a project of my own, something that doesn't have an online repo. How do I create a local git version of a directory on my machine? I tried

Re: CM 1.1 git question

2009-02-19 Thread Jonathan Kulp
Carl D. Sorensen wrote: On 2/19/09 9:53 AM, Jonathan Kulp jonlancek...@gmail.com wrote: This sounds really useful. I'd like to try to get comfortable with git on a project of my own, something that doesn't have an online repo. How do I create a local git version of a directory on my

Re: CM 1.1 git question

2009-02-19 Thread Jean-Charles Malahieude
Le 19.02.2009 20:56, Jonathan Kulp disait : Carl D. Sorensen wrote: On 2/19/09 9:53 AM, Jonathan Kulp jonlancek...@gmail.com wrote: This sounds really useful. I'd like to try to get comfortable with git on a project of my own, something that doesn't have an online repo. How do I create

Re: CM 1.1 git question

2009-02-19 Thread Maximilian Albert
2009/2/19 Jonathan Kulp jonlancek...@gmail.com: Thanks Carl Maximilian for this help. I've got it going now. At the moment I don't see all the advantages of it for this project but I'm getting used to the git commands and conventions at least. As I said, I also use git to track a lot of

Re: CM 1.1 git question

2009-02-19 Thread Jonathan Kulp
Maximilian Albert wrote: 2009/2/19 Jonathan Kulp jonlancek...@gmail.com: After I compile, though, and then do git status I get an enormous number of untracked files created since the last commit. You should create a file called .gitignore (note the initial dot) in the toplevel directory of

Re: CM 1.1 git question

2009-02-19 Thread Carl D. Sorensen
On 2/19/09 12:56 PM, Jonathan Kulp jonlancek...@gmail.com wrote: Carl D. Sorensen wrote: On 2/19/09 9:53 AM, Jonathan Kulp jonlancek...@gmail.com wrote: This sounds really useful. I'd like to try to get comfortable with git on a project of my own, something that doesn't have an

Re: CM 1.1 git question

2009-02-18 Thread Graham Percival
On Tue, Feb 17, 2009 at 05:54:24PM +0100, Johannes Schindelin wrote: Hi, On Tue, 17 Feb 2009, Jonathan Kulp wrote: Yes, it does set things up properly. I first acquired the repo using the git-clone command and now I grab updates just fine with git pull origin. I think these are the

Re: CM 1.1 git question

2009-02-18 Thread Graham Percival
On Tue, Feb 17, 2009 at 05:53:06PM +0100, Johannes Schindelin wrote: 1. git-clone gets the entire repo, not just the particular branch that you want. Indeed, but as Git is pretty efficient, simplicity beats correctness here. What if a newbie wants to fix some typos in the English docs,

Re: CM 1.1 git question

2009-02-18 Thread Johannes Schindelin
Hi, On Wed, 18 Feb 2009, Graham Percival wrote: On Tue, Feb 17, 2009 at 05:53:06PM +0100, Johannes Schindelin wrote: 1. git-clone gets the entire repo, not just the particular branch that you want. Indeed, but as Git is pretty efficient, simplicity beats correctness here.

Re: CM 1.1 git question

2009-02-18 Thread Graham Percival
On Wed, Feb 18, 2009 at 03:25:59PM +0100, Johannes Schindelin wrote: Sorry, I was _way_ too terse (but look at the time I wrote this; and I was still working, not watching TV)... :) What I really meant is: A 'git clone' will fetch too many branches. So it is not efficient. But it is

Re: CM 1.1 git question

2009-02-18 Thread Jonathan Kulp
Graham Percival wrote: On Tue, Feb 17, 2009 at 05:54:24PM +0100, Johannes Schindelin wrote: Hi, On Tue, 17 Feb 2009, Jonathan Kulp wrote: Yes, it does set things up properly. I first acquired the repo using the git-clone command and now I grab updates just fine with git pull origin. I

Re: CM 1.1 git question

2009-02-18 Thread Johannes Schindelin
Hi. On Wed, 18 Feb 2009, Jonathan Kulp wrote: Am I correct in thinking that [git format-patch] creates the patch by comparing my local (changed) file with the corresponding file in the remote git repository? No, it creates patches from commits. So you use Git as usual: (inspect

Re: CM 1.1 git question

2009-02-18 Thread Graham Percival
On Wed, Feb 18, 2009 at 03:57:39PM +0100, Johannes Schindelin wrote: Hi. On Wed, 18 Feb 2009, Jonathan Kulp wrote: Am I correct in thinking that [git format-patch] creates the patch by comparing my local (changed) file with the corresponding file in the remote git repository? No,

Re: CM 1.1 git question

2009-02-18 Thread Johannes Schindelin
Hi, On Wed, 18 Feb 2009, Graham Percival wrote: On Wed, Feb 18, 2009 at 03:57:39PM +0100, Johannes Schindelin wrote: Hi. On Wed, 18 Feb 2009, Jonathan Kulp wrote: Am I correct in thinking that [git format-patch] creates the patch by comparing my local (changed) file with the

Re: CM 1.1 git question

2009-02-18 Thread Jonathan Kulp
Johannes Schindelin wrote: Hi. On Wed, 18 Feb 2009, Jonathan Kulp wrote: Am I correct in thinking that [git format-patch] creates the patch by comparing my local (changed) file with the corresponding file in the remote git repository? No, it creates patches from commits. So you use Git

Re: CM 1.1 git question

2009-02-18 Thread Johannes Schindelin
Hi, On Wed, 18 Feb 2009, Jonathan Kulp wrote: Johannes Schindelin wrote: On Wed, 18 Feb 2009, Jonathan Kulp wrote: Am I correct in thinking that [git format-patch] creates the patch by comparing my local (changed) file with the corresponding file in the remote git repository?

Re: CM 1.1 git question

2009-02-18 Thread Carl D. Sorensen
On 2/18/09 9:49 AM, Jonathan Kulp jonlancek...@gmail.com wrote: I don't have commit privileges. Is this commit command a local commit or...where does it commit to? Frankly I'm scared of committment. :) I also don't understand which files it's comparing. When you decide to edit a file,

Re: CM 1.1 git question

2009-02-18 Thread Jonathan Kulp
Ok I found a typo in the git instructions of CG and followed your instructions to create the patch using git. Seems to have worked great! Would someone with push privileges please review the patch and apply if it looks ok? Again, Johannes, many thanks for your patience in explaining this to

Re: CM 1.1 git question

2009-02-18 Thread Jonathan Kulp
Carl D. Sorensen wrote: Jon, Now that you've got git installed, you can do this much easier. I've had git installed for a long time I just didn't know any commands except git pull origin. :) 8. send patch to someone with commit privileges Keep doing this. Just now I sent a patch

Re: CM 1.1 git question

2009-02-18 Thread Johannes Schindelin
Hi, On Wed, 18 Feb 2009, Jonathan Kulp wrote: Again, Johannes, many thanks for your patience in explaining this to a non-developer. :) You are very welcome! Thank you for your contributions, Dscho ___ lilypond-devel mailing list

Re: CM 1.1 git question

2009-02-18 Thread Johannes Schindelin
Hi, On Wed, 18 Feb 2009, Jonathan Kulp wrote: I realized after I sent it, though, that I sent it from my Thunderbird email client and this historically has jacked up the line endings. We had a very interesting discussion with one of the Thunderbirds on the Git list (who I dragged into the

Re: CM 1.1 git question

2009-02-18 Thread Jonathan Kulp
Johannes Schindelin wrote: Hi, On Wed, 18 Feb 2009, Jonathan Kulp wrote: I realized after I sent it, though, that I sent it from my Thunderbird email client and this historically has jacked up the line endings. We had a very interesting discussion with one of the Thunderbirds on the Git

Re: CM 1.1 git question

2009-02-18 Thread Jonathan Kulp
Johannes Schindelin wrote: Hi, On Wed, 18 Feb 2009, Jonathan Kulp wrote: I realized after I sent it, though, that I sent it from my Thunderbird email client and this historically has jacked up the line endings. Johannes, If you still have the email with my patch attached, could you open

Re: CM 1.1 git question

2009-02-18 Thread Johannes Schindelin
Hi, On Wed, 18 Feb 2009, Jonathan Kulp wrote: Johannes Schindelin wrote: Hi, On Wed, 18 Feb 2009, Jonathan Kulp wrote: I realized after I sent it, though, that I sent it from my Thunderbird email client and this historically has jacked up the line endings. Johannes, If

Re: CM 1.1 git question

2009-02-17 Thread Graham Percival
On Mon, Feb 16, 2009 at 06:36:24PM -0700, Andrew Hawryluk wrote: In the instructions for getting the source code, why not just use git-clone? Is there a difference? The currently suggested method of remote-add + checkout produces a bunch of warnings (below). 1. git-clone gets the entire repo,

Re: CM 1.1 git question

2009-02-17 Thread Jonathan Kulp
Graham Percival wrote: 3. I'm not certain if git-clone sets up everything for doing git pull origin and git push origin. Yes, it does set things up properly. I first acquired the repo using the git-clone command and now I grab updates just fine with git pull origin. I think these are

Re: CM 1.1 git question

2009-02-17 Thread Johannes Schindelin
Hi, On Tue, 17 Feb 2009, Graham Percival wrote: On Mon, Feb 16, 2009 at 06:36:24PM -0700, Andrew Hawryluk wrote: In the instructions for getting the source code, why not just use git-clone? Is there a difference? The currently suggested method of remote-add + checkout produces a bunch of

Re: CM 1.1 git question

2009-02-17 Thread Johannes Schindelin
Hi, On Tue, 17 Feb 2009, Jonathan Kulp wrote: Graham Percival wrote: 3. I'm not certain if git-clone sets up everything for doing git pull origin and git push origin. Yes, it does set things up properly. I first acquired the repo using the git-clone command and now I grab updates

CM 1.1 git question

2009-02-16 Thread Andrew Hawryluk
Graham et al, In the instructions for getting the source code, why not just use git-clone? Is there a difference? The currently suggested method of remote-add + checkout produces a bunch of warnings (below). Andrew and...@obi-wan:~$ mkdir lilypond-web and...@obi-wan:~$ cd lilypond-web