Re: odd configure error

2009-03-31 Thread Reinhold Kainhofer
Am Dienstag, 31. März 2009 schrieb John Mandereau: > Graham Percival a écrit : > > On Sat, Mar 28, 2009 at 11:57:06AM +0100, Reinhold Kainhofer wrote: > >> - -) git fetch + git rebase will take that local commit and append it > >> after > >> the HEAD of current master, so it will be > >>yourc

Re: odd configure error

2009-03-31 Thread John Mandereau
Graham Percival a écrit : On Sat, Mar 28, 2009 at 11:57:06AM +0100, Reinhold Kainhofer wrote: - -) git fetch + git rebase will take that local commit and append it after the HEAD of current master, so it will be yourcommit (=new local master) | current_remote_head

Re: odd configure error

2009-03-28 Thread Graham Percival
On Sat, Mar 28, 2009 at 10:21:49AM +, Daniel Hulme wrote: > On Thu, Mar 26, 2009 at 09:06:22PM +0800, Graham Percival wrote: > > On Wed, Mar 25, 2009 at 07:08:40PM +0100, James E. Bailey wrote: > > > > > > GIT from git.sv.gnu.org > > > git clone git://git.sv.gnu.org/lilypond.git > > > > T

Re: odd configure error

2009-03-28 Thread Graham Percival
On Sat, Mar 28, 2009 at 11:57:06AM +0100, Reinhold Kainhofer wrote: > On Samstag, 28. März 2009 10:48:16 Graham Percival wrote: > > I'm confused. To update git (assuming I'm in the top-level > > directory), do I need: > > git fetch > > git rebase origin/master > > or > > git pull > > ? > >

Re: odd configure error

2009-03-28 Thread Reinhold Kainhofer
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Samstag, 28. März 2009 10:48:16 Graham Percival wrote: > I'm confused. To update git (assuming I'm in the top-level > directory), do I need: > git fetch > git rebase origin/master > or > git pull > ? Both work. There is one difference, thoug

Re: odd configure error

2009-03-28 Thread Graham Percival
On Fri, Mar 27, 2009 at 04:33:56PM +0100, Reinhold Kainhofer wrote: > cd lilypond > git checkout mybranch (unless you are already there) > git fetch > git rebase origin/master > git format-patch origin/master > > > > I'm still amazed at git. Simple things should be simple. > > git pull > git ad

Re: odd configure error

2009-03-27 Thread Patrick McCarty
On Fri, Mar 27, 2009 at 8:33 AM, Reinhold Kainhofer wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Am Freitag, 27. März 2009 schrieb Graham Percival: >> On Thu, Mar 26, 2009 at 02:31:21PM -0700, Patrick McCarty wrote: >> > Let's say remote master has changed in the meantime, and you

Re: odd configure error

2009-03-27 Thread Trevor Daniels
Graham Percival wrote Friday, March 27, 2009 2:11 PM On Fri, Mar 27, 2009 at 07:56:53AM -0600, Carl D. Sorensen wrote: On 3/27/09 7:24 AM, "Jan Nieuwenhuizen" wrote: > Well, this is utterly ridiculous IMNSHO. I would suggest to > > * fix the main lilypond repo so that git clone "just

Re: odd configure error

2009-03-27 Thread Reinhold Kainhofer
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am Freitag, 27. März 2009 schrieb Graham Percival: > On Thu, Mar 26, 2009 at 02:31:21PM -0700, Patrick McCarty wrote: > > Let's say remote master has changed in the meantime, and you want to > > create a new patch rebased on current master: > > > > cd

Re: odd configure error

2009-03-27 Thread Jan Nieuwenhuizen
Op vrijdag 27-03-2009 om 22:11 uur [tijdzone +0800], schreef Graham Percival: > Now, according to Patrick, "git clone" works for the main branch. That's my experience, at least with git 1.6. > Another question is whether it makes sense to keep web/ as a > branch in the main lilypond git. I mean

Re: odd configure error

2009-03-27 Thread Graham Percival
On Thu, Mar 26, 2009 at 02:31:21PM -0700, Patrick McCarty wrote: > Let's say remote master has changed in the meantime, and you want to > create a new patch rebased on current master: > > cd lilypond > git checkout master > git pull > git checkout mybranch > git rebase master > git format-patch ma

Re: odd configure error

2009-03-27 Thread Graham Percival
On Fri, Mar 27, 2009 at 07:56:53AM -0600, Carl D. Sorensen wrote: > > On 3/27/09 7:24 AM, "Jan Nieuwenhuizen" wrote: > > > Well, this is utterly ridiculous IMNSHO. I would suggest to > > > > * fix the main lilypond repo so that git clone "just works", or > > * ask on g...@vger.kernel.org w

Re: odd configure error

2009-03-27 Thread Carl D. Sorensen
On 3/27/09 7:24 AM, "Jan Nieuwenhuizen" wrote: > Op donderdag 26-03-2009 om 21:06 uur [tijdzone +0800], schreef Graham > Percival: > >>> GIT from git.sv.gnu.org >>> git clone git://git.sv.gnu.org/lilypond.git >> >> This does not set up easy pulling or pushing in the future, and >> genera

Re: odd configure error

2009-03-27 Thread Jan Nieuwenhuizen
Op donderdag 26-03-2009 om 21:06 uur [tijdzone +0800], schreef Graham Percival: > > GIT from git.sv.gnu.org > > git clone git://git.sv.gnu.org/lilypond.git > > This does not set up easy pulling or pushing in the future, and > generally assumes that people know how to use git > > To get the m

Re: odd configure error

2009-03-26 Thread Patrick McCarty
On Thu, Mar 26, 2009 at 6:06 AM, Graham Percival wrote: > On Wed, Mar 25, 2009 at 07:08:40PM +0100, James E. Bailey wrote: >> >> GIT from git.sv.gnu.org >>     git clone git://git.sv.gnu.org/lilypond.git > > This does not set up easy pulling or pushing in the future, and > generally assumes that p

Re: odd configure error

2009-03-26 Thread Graham Percival
On Wed, Mar 25, 2009 at 07:08:40PM +0100, James E. Bailey wrote: > > GIT from git.sv.gnu.org > git clone git://git.sv.gnu.org/lilypond.git This does not set up easy pulling or pushing in the future, and generally assumes that people know how to use git. It also downloads all branches, which

Re: odd configure error

2009-03-25 Thread James E. Bailey
Am 25.03.2009 um 14:54 schrieb John Mandereau: James E. Bailey a écrit : Am 25.03.2009 um 14:41 schrieb Graham Percival: Nothing; they come from exactly the same source. The version in the AU is going to die soon, where "soon" means "within 4 months". So then why the difference? I should

Re: odd configure error

2009-03-25 Thread John Mandereau
James E. Bailey a écrit : Am 25.03.2009 um 14:41 schrieb Graham Percival: Nothing; they come from exactly the same source. The version in the AU is going to die soon, where "soon" means "within 4 months". So then why the difference? I should think a one line command to get the source is eas

Re: odd configure error

2009-03-25 Thread James E. Bailey
Am 25.03.2009 um 14:41 schrieb Graham Percival: On Wed, Mar 25, 2009 at 02:37:10PM +0100, James E. Bailey wrote: Although apropos of nothing, what's the difference between the instructions in the AU (and on the web-site) on getting the source code, and the instructions in the CG? Nothing; th

Re: odd configure error

2009-03-25 Thread Graham Percival
On Wed, Mar 25, 2009 at 02:37:10PM +0100, James E. Bailey wrote: > Although apropos of nothing, what's the difference between the > instructions in the AU (and on the web-site) on getting the > source code, and the instructions in the CG? Nothing; they come from exactly the same source. The versi

Re: odd configure error

2009-03-25 Thread James E. Bailey
Am 25.03.2009 um 12:50 schrieb John Mandereau: James E. Bailey a écrit : I'm having a configure error, and I don't know how to solve it. I get this: ERROR: Please install required programs: /Users/lilydev/bin/ fontforge >= 20050624 (installed: .fontforge 20080927) What does 'which fontfo

Re: odd configure error

2009-03-25 Thread John Mandereau
James E. Bailey a écrit : I'm having a configure error, and I don't know how to solve it. I get this: ERROR: Please install required programs: /Users/lilydev/bin/fontforge >= 20050624 (installed: .fontforge 20080927) What does 'which fontforge' and '`which fontforge` --version' say? Could yo

odd configure error

2009-03-24 Thread James E. Bailey
I'm having a configure error, and I don't know how to solve it. I get this: ERROR: Please install required programs: /Users/lilydev/bin/ fontforge >= 20050624 (installed: .fontforge 20080927) See INSTALL.txt for more information on how to build LilyPond The version of fontforge installed i