Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-12 Thread Maximilian Albert
2009/8/12 Johannes Schindelin : >> Yep, verified. Many thanks once again! I think this can be very useful >> for new contributors. > > I hope so. > > Maybe you tell me the most common operations, and I'll add the > functionality? Hmm, I'm probably not the right person to ask because I guess I'm n

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-12 Thread Johannes Schindelin
Hi, On Wed, 12 Aug 2009, Maximilian Albert wrote: > 2009/8/12 Johannes Schindelin : > > > Fixed and pushed. > > Yep, verified. Many thanks once again! I think this can be very useful > for new contributors. I hope so. Maybe you tell me the most common operations, and I'll add the functional

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Maximilian Albert
2009/8/12 Johannes Schindelin : > Fixed and pushed. Yep, verified. Many thanks once again! I think this can be very useful for new contributors. Max ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Johannes Schindelin
Hi, On Wed, 12 Aug 2009, Maximilian Albert wrote: > 2009/8/11 Johannes Schindelin : > > > I actually had to change the --work-tree things, since it is utter > > garbage.  I _know_ why I was opposed to its inclusion. > > > > [..] > > > > I added two shorter notices, and I also set the busy cursor

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Maximilian Albert
2009/8/11 Johannes Schindelin : > I actually had to change the --work-tree things, since it is utter > garbage.  I _know_ why I was opposed to its inclusion. > > [..] > > I added two shorter notices, and I also set the busy cursor now. Hehe, sorry for complaining again. But now the script aborts

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Johannes Schindelin
Hi, On Tue, 11 Aug 2009, Maximilian Albert wrote: > > I pushed a new version to git://repo.or.cz/lilypond/dscho.git.  You > > can download it directly here: > > > > http://repo.or.cz/w/lilypond/dscho.git?a=blob_plain;f=lilycontrib.tcl;hb=lilycontrib > > Cool, works like a charm now. Thanks a lo

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Maximilian Albert
Hi Johannes, > I pushed a new version to git://repo.or.cz/lilypond/dscho.git.  You can > download it directly here: > > http://repo.or.cz/w/lilypond/dscho.git?a=blob_plain;f=lilycontrib.tcl;hb=lilycontrib Cool, works like a charm now. Thanks a lot! One minor comment: For new contributors with no

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Johannes Schindelin
Hi, On Tue, 11 Aug 2009, Jonathan Kulp wrote: > On Tue, Aug 11, 2009 at 7:00 AM, Jonathan Kulp wrote: > > > On Tue, Aug 11, 2009 at 6:45 AM, Johannes Schindelin < > > johannes.schinde...@gmx.de> wrote: > > > >> > > >> > So it doesn't give an error, just a warning. But AFAIR I have seen this > >>

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Johannes Schindelin
Hi, On Tue, 11 Aug 2009, Jonathan Kulp wrote: > On Tue, Aug 11, 2009 at 6:45 AM, Johannes Schindelin < > johannes.schinde...@gmx.de> wrote: > > > > > > > So it doesn't give an error, just a warning. But AFAIR I have seen > > > this warning on my non-GUI-based checkouts, too, even though > > >

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Johannes Schindelin
Hi, On Tue, 11 Aug 2009, Jonathan Kulp wrote: > On Tue, Aug 11, 2009 at 4:12 AM, Maximilian Albert < > maximilian.alb...@googlemail.com> wrote: > > > P.S.: It would be nice to let the script print a short message when > > it's finished so that the user know when to stop waiting. ;-) > > I had t

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Jonathan Kulp
On Tue, Aug 11, 2009 at 7:00 AM, Jonathan Kulp wrote: > On Tue, Aug 11, 2009 at 6:45 AM, Johannes Schindelin < > johannes.schinde...@gmx.de> wrote: > >> > >> > So it doesn't give an error, just a warning. But AFAIR I have seen this >> > warning on my non-GUI-based checkouts, too, even though every

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Jonathan Kulp
On Tue, Aug 11, 2009 at 6:45 AM, Johannes Schindelin < johannes.schinde...@gmx.de> wrote: > > > > So it doesn't give an error, just a warning. But AFAIR I have seen this > > warning on my non-GUI-based checkouts, too, even though everything > > worked fine. BTW, my git version is 1.6.0.4 (the late

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Johannes Schindelin
Hi, On Tue, 11 Aug 2009, Maximilian Albert wrote: > 2009/8/11 Johannes Schindelin : > > > It actually worked here, twice. > > > > But you have this wonderful output field in the GUI, what does it have to > > say? I imagine that it gave you some error message or some such (probably > > due to an

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Jonathan Kulp
On Tue, Aug 11, 2009 at 4:12 AM, Maximilian Albert < maximilian.alb...@googlemail.com> wrote: > 2009/8/11 Johannes Schindelin : > > > It actually worked here, twice. > > > > But you have this wonderful output field in the GUI, what does it have to > > say? I imagine that it gave you some error mes

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Maximilian Albert
2009/8/11 Johannes Schindelin : > It actually worked here, twice. > > But you have this wonderful output field in the GUI, what does it have to > say? I imagine that it gave you some error message or some such (probably > due to an older Git version that refuses to update the current 'master' > br

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-11 Thread Johannes Schindelin
Hi, On Tue, 11 Aug 2009, Maximilian Albert wrote: > 2009/8/11 Johannes Schindelin : > > >  It actually only gives you a "Clone/Update" button that makes sure > > that a local clone (hardcoded to $HOME/lilypond) is up-to-date, but at > > least it has a progress bar, and I verified that it works

Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-10 Thread Maximilian Albert
2009/8/11 Johannes Schindelin : > Okay, I could not resist, so here is something more capable. Thanks for not being more resistable. :-) (And for giving a nice illustration how easy it actually is to write a quick hacked-up GUI - I guess that'll be useful to me on many occasions in the future).

lilycontrib.tcl, was Re: the "r" in "git pull -r"

2009-08-10 Thread Johannes Schindelin
Hi, On Mon, 10 Aug 2009, Johannes Schindelin wrote: > On Mon, 10 Aug 2009, Graham Percival wrote: > > > On Mon, Aug 10, 2009 at 10:34:11AM +0200, Johannes Schindelin wrote: > > > On Mon, 10 Aug 2009, Graham Percival wrote: > > > > > > > We've lost 50% of potential contributors to the website be

Re: the "r" in "git pull -r"

2009-08-10 Thread Johannes Schindelin
Hi, On Mon, 10 Aug 2009, Graham Percival wrote: > On Mon, Aug 10, 2009 at 10:34:11AM +0200, Johannes Schindelin wrote: > > On Mon, 10 Aug 2009, Graham Percival wrote: > > > > > We've lost 50% of potential contributors to the website because of > > > git. > > > > Fair enough. Maybe it is time to

Re: the "r" in "git pull -r"

2009-08-10 Thread Francisco Vila
2009/8/10 Graham Percival : > On Mon, Aug 10, 2009 at 10:50:09AM +0200, John Mandereau wrote: >> Le lundi 10 août 2009 à 01:18 -0700, Graham Percival a écrit : >> > We've lost 50% of potential contributors to the website because of >> > git. >> >> And we've lost the same percentage of potential Fre

Re: the "r" in "git pull -r"

2009-08-10 Thread Graham Percival
On Mon, Aug 10, 2009 at 10:50:09AM +0200, John Mandereau wrote: > Le lundi 10 août 2009 à 01:18 -0700, Graham Percival a écrit : > > We've lost 50% of potential contributors to the website because of > > git. > > And we've lost the same percentage of potential French translators; I'm > sorry to re

Re: the "r" in "git pull -r"

2009-08-10 Thread Trevor Daniels
Graham Percival wrote Monday, August 10, 2009 9:18 AM On Mon, Aug 10, 2009 at 08:45:22AM +0100, Trevor Daniels wrote: Graham Percival wrote Monday, August 10, 2009 12:48 AM I maoing hate git. Git is fine; the complexity comes from the baroque structures in LilyPond. Let's be thankful Git

Re: the "r" in "git pull -r"

2009-08-10 Thread John Mandereau
Le lundi 10 août 2009 à 01:18 -0700, Graham Percival a écrit : > We've lost 50% of potential contributors to the website because of > git. And we've lost the same percentage of potential French translators; I'm sorry to remark that most of them who didn't spend the effort to master Git and stopped

Re: the "r" in "git pull -r"

2009-08-10 Thread Graham Percival
On Mon, Aug 10, 2009 at 10:34:11AM +0200, Johannes Schindelin wrote: > On Mon, 10 Aug 2009, Graham Percival wrote: > > > We've lost 50% of potential contributors to the website because of > > git. > > Fair enough. Maybe it is time to suggest an easy interface to Git? You > could even write a ve

Re: the "r" in "git pull -r"

2009-08-10 Thread Johannes Schindelin
Hi, On Mon, 10 Aug 2009, Graham Percival wrote: > On Mon, Aug 10, 2009 at 08:45:22AM +0100, Trevor Daniels wrote: > > > > Graham Percival wrote Monday, August 10, 2009 12:48 AM > >> I maoing hate git. > > > > Git is fine; the complexity comes from the > > baroque structures in LilyPond. Let's be

Re: the "r" in "git pull -r"

2009-08-10 Thread Graham Percival
On Mon, Aug 10, 2009 at 08:45:22AM +0100, Trevor Daniels wrote: > > Graham Percival wrote Monday, August 10, 2009 12:48 AM >> I maoing hate git. > > Git is fine; the complexity comes from the > baroque structures in LilyPond. Let's be > thankful Git has tools to cope :) Oh? Didn't you comment th

Re: the "r" in "git pull -r"

2009-08-10 Thread John Mandereau
Le lundi 10 août 2009 à 00:56 -0700, Graham Percival a écrit : > After spending a while reading and re-reading your addition to the > CG git stuff, it sounds like this only applies to translated docs > -- i.e. as long as I don't mess with anything in de/ es/ fr/ etc/, > it's safe to "git pull -r".

Re: the "r" in "git pull -r"

2009-08-10 Thread John Mandereau
Le dimanche 09 août 2009 à 16:48 -0700, Graham Percival a écrit : > Mao. So that means that we don't want to add > git config --global branch.autosetuprebase always > to the git setup, and we still have to tell people to do > git pull -r > instead of > git pull > ? You didn't read the end o

Re: the "r" in "git pull -r"

2009-08-10 Thread Graham Percival
On Sun, Aug 09, 2009 at 04:48:45PM -0700, Graham Percival wrote: > On Sun, Aug 09, 2009 at 11:45:05PM +0200, John Mandereau wrote: > > Le samedi 08 août 2009 à 13:55 -0600, Carl Sorensen a écrit : > > > As a practical matter, -r first applies the changes that were made on > > > origin > > > (sinc

Re: the "r" in "git pull -r"

2009-08-10 Thread Trevor Daniels
Graham Percival wrote Monday, August 10, 2009 12:48 AM On Sun, Aug 09, 2009 at 11:45:05PM +0200, John Mandereau wrote: Le samedi 08 août 2009 à 13:55 -0600, Carl Sorensen a écrit : > As a practical matter, -r first applies the changes that were > made on origin > (since your branch was check

Re: the "r" in "git pull -r"

2009-08-09 Thread Graham Percival
On Sun, Aug 09, 2009 at 11:45:05PM +0200, John Mandereau wrote: > Le samedi 08 août 2009 à 13:55 -0600, Carl Sorensen a écrit : > > As a practical matter, -r first applies the changes that were made on origin > > (since your branch was checked out), then applies your changes on top of the > > curr

Re: the "r" in "git pull -r"

2009-08-09 Thread Carl Sorensen
On 8/9/09 4:27 PM, "John Mandereau" wrote: > Le dimanche 09 août 2009 à 16:21 -0600, Carl Sorensen a écrit : >> Perfect! I hope I didn't mess up the translated docs too badly with my >> recent merge. > > The only risk to mess up translated docs checking is in case you change > committishes t

Re: the "r" in "git pull -r"

2009-08-09 Thread John Mandereau
Le dimanche 09 août 2009 à 16:21 -0600, Carl Sorensen a écrit : > Perfect! I hope I didn't mess up the translated docs too badly with my > recent merge. The only risk to mess up translated docs checking is in case you change committishes that appear as comments at the head of each file. If this

Re: the "r" in "git pull -r"

2009-08-09 Thread Carl Sorensen
On 8/9/09 3:45 PM, "John Mandereau" wrote: > Le samedi 08 août 2009 à 13:55 -0600, Carl Sorensen a écrit : >> As a practical matter, -r first applies the changes that were made on origin >> (since your branch was checked out), then applies your changes on top of the >> current origin. The pre

Re: the "r" in "git pull -r"

2009-08-09 Thread John Mandereau
Le samedi 08 août 2009 à 13:55 -0600, Carl Sorensen a écrit : > As a practical matter, -r first applies the changes that were made on origin > (since your branch was checked out), then applies your changes on top of the > current origin. The prevents an extra commit to merge your branch with > or

Re: the "r" in "git pull -r"

2009-08-08 Thread Carl Sorensen
On 8/7/09 8:45 PM, "Patrick McCarty" wrote: > On Fri, Aug 07, 2009 at 07:34:01PM -0700, Mark Polesky wrote: >> >> Regarding CG 1.2.2: >> http://kainhofer.com/~lilypond/Documentation/contributor/Update-command.html >> >> What does "-r" do in "git pull -r"? I don't see "-r" >> listed as an opt

Re: the "r" in "git pull -r"

2009-08-08 Thread Valentin Villenave
2009/8/8 Graham Percival : > Despite my above paragraph, I'm not opposed to adding links to > people's favorite git tutorial.  However, I don't expect any > contributor to read them, and I certainly won't be reading any. *I* for one would certainly have read such links when I got started with git.

Re: the "r" in "git pull -r"

2009-08-08 Thread John Mandereau
Le samedi 08 août 2009 à 01:46 -0700, Graham Percival a écrit : > Despite my above paragraph, I'm not opposed to adding links to > people's favorite git tutorial. However, I don't expect any > contributor to read them, and I certainly won't be reading any. FWIW I usually expect translators to rea

Re: the "r" in "git pull -r"

2009-08-08 Thread Graham Percival
On Fri, Aug 07, 2009 at 11:20:29PM -0700, Patrick McCarty wrote: > On Fri, Aug 07, 2009 at 11:02:49PM -0600, Andrew Hawryluk wrote: > > On Fri, Aug 7, 2009 at 8:45 PM, Patrick McCarty wrote: > > > I think it would be nice to have an entire CG section devoted to > > > explaining what "rebasing" mean

Re: the "r" in "git pull -r"

2009-08-07 Thread John Mandereau
Le vendredi 07 août 2009 à 19:45 -0700, Patrick McCarty a écrit : > I think it would be nice to have an entire CG section devoted to > explaining what "rebasing" means, but the "git rebase" man page > provides a reasonably good explanation in the meantime. > > http://www.kernel.org/pub/software/sc

Re: the "r" in "git pull -r"

2009-08-07 Thread Patrick McCarty
On Fri, Aug 07, 2009 at 11:02:49PM -0600, Andrew Hawryluk wrote: > On Fri, Aug 7, 2009 at 8:45 PM, Patrick McCarty wrote: > > On Fri, Aug 07, 2009 at 07:34:01PM -0700, Mark Polesky wrote: > >> > >> Regarding CG 1.2.2: > >> http://kainhofer.com/~lilypond/Documentation/contributor/Update-command.html

Re: the "r" in "git pull -r"

2009-08-07 Thread Andrew Hawryluk
On Fri, Aug 7, 2009 at 8:45 PM, Patrick McCarty wrote: > On Fri, Aug 07, 2009 at 07:34:01PM -0700, Mark Polesky wrote: >> >> Regarding CG 1.2.2: >> http://kainhofer.com/~lilypond/Documentation/contributor/Update-command.html >> >> What does "-r" do in "git pull -r"? I don't see "-r" >> listed as an

Re: the "r" in "git pull -r"

2009-08-07 Thread Patrick McCarty
On Fri, Aug 07, 2009 at 07:34:01PM -0700, Mark Polesky wrote: > > Regarding CG 1.2.2: > http://kainhofer.com/~lilypond/Documentation/contributor/Update-command.html > > What does "-r" do in "git pull -r"? I don't see "-r" > listed as an option here: > http://www.kernel.org/pub/software/scm/git/do

the "r" in "git pull -r"

2009-08-07 Thread Mark Polesky
Regarding CG 1.2.2: http://kainhofer.com/~lilypond/Documentation/contributor/Update-command.html What does "-r" do in "git pull -r"? I don't see "-r" listed as an option here: http://www.kernel.org/pub/software/scm/git/docs/git-pull.html - Mark ___