- Original Message -
From: David Kastrup d...@gnu.org
To: lilypond-devel@gnu.org
Sent: Tuesday, November 15, 2011 2:43 PM
Subject: Re: Pushing patches to staging
Phil Holmes m...@philholmes.net writes:
- Original Message -
From: Carl Sorensen c_soren...@byu.edu
[snip
Phil Holmes m...@philholmes.net writes:
git fetch (to be sure you have the current version of staging)
git checkout origin/staging
... commit your simple change ...
git push origin HEAD:staging
This assumes that you have staging in the branches you fetch. If that
is not the case, add an
- Original Message -
From: Carl Sorensen c_soren...@byu.edu
[snip]
No -- your set of commands will *NOT* work.
No, this set of my commands is not correct, because staging can be reset.
So we never want to merge on it, and the git pull commands will do a
merge.
I will get a
Phil Holmes m...@philholmes.net writes:
- Original Message -
From: Carl Sorensen c_soren...@byu.edu
[snip]
No -- your set of commands will *NOT* work.
No, this set of my commands is not correct, because staging can be reset.
So we never want to merge on it, and the git pull
- Original Message -
From: David Kastrup d...@gnu.org
To: lilypond-devel@gnu.org
Sent: Tuesday, November 15, 2011 2:43 PM
Subject: Re: Pushing patches to staging
Phil Holmes m...@philholmes.net writes:
- Original Message -
From: Carl Sorensen c_soren...@byu.edu
[snip
Phil Holmes m...@philholmes.net writes:
- Original Message -
From: David Kastrup d...@gnu.org
To: lilypond-devel@gnu.org
Sent: Tuesday, November 15, 2011 2:43 PM
Subject: Re: Pushing patches to staging
Thanks, David. I've seen your earlier mail where you recommend:
Make sure
- Original Message -
From: Carl Sorensen c_soren...@byu.edu
To: Graham Percival gra...@percival-music.ca; David Kastrup
d...@gnu.org
Cc: lilypond-devel@gnu.org
Sent: Saturday, November 12, 2011 11:59 PM
Subject: Re: Pushing patches to staging
On 11/12/11 3:08 PM, Graham Percival gra
Phil Holmes m...@philholmes.net writes:
Here's Carl's simple amended recipe, with my changes/comments. Can
those that understand confirm this is OK?
This is not particularly funny anymore.
--
David Kastrup
___
lilypond-devel mailing list
On 11/13/11 3:51 AM, Phil Holmes m...@philholmes.net wrote:
- Original Message -
From: Carl Sorensen c_soren...@byu.edu
To: Graham Percival gra...@percival-music.ca; David Kastrup
d...@gnu.org
Cc: lilypond-devel@gnu.org
Sent: Saturday, November 12, 2011 11:59 PM
Subject: Re: Pushing
At some point in the near future, I'll need to push a CG patch to update the
bug squad rota. My understanding is that this should now be done to
dev/staging rather than master. I've read David's note about how to do
this, and wonder whether that's all necessary for a simple patch that's in
Phil Holmes em...@philholmes.net writes:
At some point in the near future, I'll need to push a CG patch to
update the bug squad rota. My understanding is that this should now
be done to dev/staging rather than master. I've read David's note
about how to do this, and wonder whether that's
with the above?
See above. I'm an idiot, and even if I wasn't an idiot, I don't
want to think. I want copypaste command lines.
b) I don't think this is currently in the CG - should I add it?
Yes totally. Not in the quick start section, since anybody
reading that will have somebody else pushing
Hello,
On Sat, Nov 12, 2011 at 6:58 PM, David Kastrup d...@gnu.org wrote:
Phil Holmes em...@philholmes.net writes:
At some point in the near future, I'll need to push a CG patch to
update the bug squad rota. My understanding is that this should now
be done to dev/staging rather than master.
Graham Percival gra...@percival-music.ca writes:
On Sat, Nov 12, 2011 at 07:58:55PM +0100, David Kastrup wrote:
Phil Holmes em...@philholmes.net writes:
At some point in the near future, I'll need to push a CG patch to
update the bug squad rota. My understanding is that this should now
Peekay Ex pkx1...@gmail.com writes:
So does that mean we are considering this 'staging' branch push
experiment a (near) success or at least something we all agree on or
is that another GOPpy thing? - I know we've had some minor
inconveniences with this method that requires knowledge of git
On Sat, Nov 12, 2011 at 08:43:54PM +0100, David Kastrup wrote:
Graham Percival gra...@percival-music.ca writes:
What does rebase to your push target mean?
You can't push if the pushed branch is not a descendant of the branch
you push to.
It's not like this a surprising new thing. It's
On Sat, Nov 12, 2011 at 08:56:38PM +0100, David Kastrup wrote:
And you can't push to master anyway without having rebased (or merged,
which one does not usually want to see upstream) your development branch
to its current state, so I have trouble understanding your problem.
You're assuming
Graham Percival gra...@percival-music.ca writes:
On Sat, Nov 12, 2011 at 08:43:54PM +0100, David Kastrup wrote:
Graham Percival gra...@percival-music.ca writes:
What does rebase to your push target mean?
You can't push if the pushed branch is not a descendant of the branch
you push to.
On 11/12/11 3:08 PM, Graham Percival gra...@percival-music.ca wrote:
The only problem is to develop a series of simple commands to do
this task.
Here's my set of simple commands:
git checkout master
git pull origin master
git apply my_patch_file_name_goes_here
git checkout staging
git pull
On Sun, Nov 13, 2011 at 12:13:18AM +0100, David Kastrup wrote:
Graham Percival gra...@percival-music.ca writes:
Sorry, I was unclear.
- I am a new contributor. No wait, a new developer who has just
been given git push ability.
- I am a stupid.
Why would one have given you push
On 11/12/11 4:59 PM, Carl Sorensen c_soren...@byu.edu wrote:
On 11/12/11 3:08 PM, Graham Percival gra...@percival-music.ca wrote:
The only problem is to develop a series of simple commands to do
this task.
Here's my set of simple commands:
git checkout master
git pull origin master
git
Graham Percival gra...@percival-music.ca writes:
**OR**... I could run the 7 commands that Carl suggested, and
spend those X hours working on lilypond instead of reading git
docs.
I think that second option is best for the project.
James, Phil? Please test those commands, and if they
Carl Sorensen c_soren...@byu.edu writes:
On 11/12/11 3:08 PM, Graham Percival gra...@percival-music.ca wrote:
The only problem is to develop a series of simple commands to do
this task.
Here's my set of simple commands:
git checkout master
git pull origin master
If you did your own
Carl Sorensen c_soren...@byu.edu writes:
On 11/12/11 4:59 PM, Carl Sorensen c_soren...@byu.edu wrote:
On 11/12/11 3:08 PM, Graham Percival gra...@percival-music.ca wrote:
The only problem is to develop a series of simple commands to do
this task.
Here's my set of simple commands:
git
On 11/12/11 9:06 PM, David Kastrup d...@gnu.org wrote:
If you use git am on a patch (or patch series) created with git
format-patch, it will do the equivalent of cherry-picks instead of just
duplicating the effect on the work tree. Better for the history than
just patching. Worse than
Graham, you wrote Sunday, February 13, 2011 2:32 AM
Hey guys, could you push your patches that have passed review?
That's:
1499 Modal transformations
Still waiting for an update from Mike Ellis.
1426 Better support for beat slashes
1211 Optimizations for pure-heigh approximations
Cheers,
On Sun, Feb 13, 2011 at 1:32 PM, Graham Percival
gra...@percival-music.cawrote:
Hey guys, could you push your patches that have passed review?
1211 Optimizations for pure-heigh approximations
Done
___
lilypond-devel mailing list
On 13 February 2011 02:32, Graham Percival gra...@percival-music.ca wrote:
Hey guys, could you push your patches that have passed review?
1426 Better support for beat slashes
Done.
Cheers,
Neil
___
lilypond-devel mailing list
lilypond-devel@gnu.org
Hey guys, could you push your patches that have passed review?
That's:
1499 Modal transformations
1426 Better support for beat slashes
1211 Optimizations for pure-heigh approximations
Cheers,
- Graham
___
lilypond-devel mailing list
29 matches
Mail list logo
