Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-09 Thread lilypond . patchy . graham
Reviewers: Graham Percival, Keith, c_sorensen_byu.edu, mail_philholmes.net, J_lowe, Message: sorry, I uploaded this with the wrong account. The patch continues here: http://codereview.appspot.com/5467051/ Description: Doc: CG: add instructions for staging branch Please review this at http://

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-03 Thread David Kastrup
James writes: > On 3 December 2011 13:59, Phil Holmes wrote: > > > > > This is the instructions I wrote to myself: > > Before you start thinking about pushing a patch to staging, you > need to ensure you have the correct local branches up to date. > One time on

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-03 Thread James
Hello, On 3 December 2011 13:59, Phil Holmes wrote: > >> > This is the instructions I wrote to myself: > > Before you start thinking about pushing a patch to staging, you > need to ensure you have the correct local branches up to date. > One time only, edit the .git/config file to look like this

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-03 Thread Phil Holmes
- Original Message - From: "Graham Percival" To: "Phil Holmes" Cc: "Carl Sorensen" ; "Keith OHara" ; ; ; Sent: Saturday, December 03, 2011 11:19 AM Subject: Re: Doc: CG: add instructions for staging branch (issue 5440080) On Sat, Dec 0

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-03 Thread Graham Percival
On Sat, Dec 03, 2011 at 10:51:49AM -, Phil Holmes wrote: > My (simple) workflow is that I use lily-git to > pull, make my changes, use lily-git to commit and create a patch, > then I usually abort my changes. I then use command line to fetch > staging, apply my patch and push to staging, using

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-03 Thread Phil Holmes
- Original Message - From: "Graham Percival" To: "Carl Sorensen" Cc: "Keith OHara" ; ; ; Sent: Saturday, December 03, 2011 6:27 AM Subject: Re: Doc: CG: add instructions for staging branch (issue 5440080) On Sat, Dec 03, 2011 at 04:05:45AM +, Ca

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-02 Thread Keith OHara
On Fri, 02 Dec 2011 22:27:38 -0800, Graham Percival wrote: I wonder if we can/should assume that no developer (i.e. person with push ability) is using lily-git.tcl. I think yes, that it is reasonable to expect people to use the command-line git on their own computer before using it to push.

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-02 Thread Graham Percival
On Sat, Dec 03, 2011 at 04:05:45AM +, Carl Sorensen wrote: > On 12/2/11 9:01 PM, "gra...@percival-music.ca" > wrote: > >However, perhaps we need to explain this (and modify lily-git.tcl). > >I'll take a look at lily-git.tcl and see how hard it would be to modify > >it. > > We can make lily-gi

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-02 Thread Carl Sorensen
On 12/2/11 9:01 PM, "gra...@percival-music.ca" wrote: >On 2011/12/03 03:39:07, Keith wrote: >> Putting commits on the local master branch is inviting an accidental >push >> directly to origin/master. Assume instead that developers have their >work on >> some other branch and merge it to stable b

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-02 Thread graham
On 2011/12/03 03:39:07, Keith wrote: Putting commits on the local master branch is inviting an accidental push directly to origin/master. Assume instead that developers have their work on some other branch and merge it to stable before pushing. But the lily-git.tcl tool automatically puts

Re: Doc: CG: add instructions for staging branch (issue 5440080)

2011-12-02 Thread k-ohara5a5a
Putting commits on the local master branch is inviting an accidental push directly to origin/master. Assume instead that developers have their work on some other branch and merge it to stable before pushing. http://codereview.appspot.com/5440080/diff/1/Documentation/contributor/source-code.itex