Re: patches to apply

2011-11-02 Thread Julien Rioux
On 02/11/2011 2:22 PM, Peekay Ex wrote: Thanks to you both, that helped a lot. I'm able to push to dev/staging now. Regards Thank you all. -- Julien ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/l

Re: patches to apply

2011-11-02 Thread Peekay Ex
David/Carl On Wed, Nov 2, 2011 at 6:01 AM, David Kastrup wrote: > Peekay Ex writes: > > Well, use whatever your tracking branch is called.  What does > git branch -r > say? jlowe@jlowe-lilybuntu2:~/lilypond-git$ git branch -r  origin/HEAD -> origin/master  origin/m

Re: patches to apply

2011-11-01 Thread David Kastrup
Peekay Ex writes: Well, use whatever your tracking branch is called.  What does git branch -r say? >>> >>>jlowe@jlowe-lilybuntu2:~/lilypond-git$ git branch -r >>>  origin/HEAD -> origin/master >>>  origin/master >> >> >> I would do: >> >> git checkout dev/staging >> git push origin

Re: patches to apply

2011-11-01 Thread Peekay Ex
Carl, On Tue, Nov 1, 2011 at 10:42 PM, Carl Sorensen wrote: > > > On 11/1/11 4:30 PM, "Peekay Ex" wrote: > >>David, >> >>On Tue, Nov 1, 2011 at 3:55 PM, David Kastrup wrote: .. > > For single patches, this is reasonably simple.  First do > > git rebase origin/dev/staging >>

Re: patches to apply

2011-11-01 Thread Carl Sorensen
On 11/1/11 4:30 PM, "Peekay Ex" wrote: >David, > >On Tue, Nov 1, 2011 at 3:55 PM, David Kastrup wrote: >> Peekay Ex writes: >> >>> On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup wrote: Peekay Ex writes: > Yes and I suppose that is why I cannot push these patches to >dev\sta

Re: patches to apply

2011-11-01 Thread Peekay Ex
David, On Tue, Nov 1, 2011 at 3:55 PM, David Kastrup wrote: > Peekay Ex writes: > >> On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup wrote: >>> Peekay Ex writes: >>> Yes and I suppose that is why I cannot push these patches to dev\staging --snip-- jlowe@jlowe-lilybuntu2:

Re: patches to apply

2011-11-01 Thread David Kastrup
Peekay Ex writes: > On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup wrote: >> Peekay Ex writes: >> >>> Yes and I suppose that is why I cannot push these patches to dev\staging >>> >>> --snip-- >>> >>> jlowe@jlowe-lilybuntu2:~/lilypond-git$ git push origin >>> HEAD:refs/heads/dev/staging >>> To ss

Re: patches to apply

2011-11-01 Thread Peekay Ex
On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup wrote: > Peekay Ex writes: > >> Yes and I suppose that is why I cannot push these patches to dev\staging >> >> --snip-- >> >> jlowe@jlowe-lilybuntu2:~/lilypond-git$ git push origin >> HEAD:refs/heads/dev/staging >> To ssh://pkx1...@git.sv.gnu.org/srv/

Re: patches to apply

2011-11-01 Thread David Kastrup
Peekay Ex writes: > Yes and I suppose that is why I cannot push these patches to dev\staging > > --snip-- > > jlowe@jlowe-lilybuntu2:~/lilypond-git$ git push origin > HEAD:refs/heads/dev/staging > To ssh://pkx1...@git.sv.gnu.org/srv/git/lilypond.git > ! [rejected]HEAD -> dev/staging (non

Re: patches to apply

2011-11-01 Thread Peekay Ex
Hello, On Tue, Nov 1, 2011 at 1:45 PM, David Kastrup wrote: > Graham Percival writes: > >> On Tue, Nov 01, 2011 at 01:32:13PM +, Peekay Ex wrote: >>> On Tue, Nov 1, 2011 at 12:22 AM, Julien Rioux >>> wrote: >>> > Can somebody please push these to patches? They were accepted in a >>> > coun

Re: patches to apply

2011-11-01 Thread David Kastrup
Graham Percival writes: > On Tue, Nov 01, 2011 at 01:32:13PM +, Peekay Ex wrote: >> On Tue, Nov 1, 2011 at 12:22 AM, Julien Rioux >> wrote: >> > Can somebody please push these to patches? They were accepted in a >> > countdown >> > over a week ago (I think it was 20111023) but they initiall

Re: patches to apply

2011-11-01 Thread Graham Percival
On Tue, Nov 01, 2011 at 01:32:13PM +, Peekay Ex wrote: > On Tue, Nov 1, 2011 at 12:22 AM, Julien Rioux > wrote: > > Can somebody please push these to patches? They were accepted in a countdown > > over a week ago (I think it was 20111023) but they initially caused some > > conflicts when the t

Re: patches to apply

2011-11-01 Thread Peekay Ex
Julien, On Tue, Nov 1, 2011 at 12:22 AM, Julien Rioux wrote: > Hi, > > Can somebody please push these to patches? They were accepted in a countdown > over a week ago (I think it was 20111023) but they initially caused some > conflicts when the time came to push them. I can push these. @graham e