headers
Julien Rioux | 1 Nov 2011 01:22
Picon
Picon
Favicon

patches to apply

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.

Thanks,
Cheers,
Julien
Attachment (0001-Fix-the-links-to-music-samples-in-web-big-page-issue.patch): text/x-diff, 164 KiB
Attachment (0002-Fix-hyperlinks-on-web-big-page-issue-1917.patch): text/x-diff, 11 KiB
_______________________________________________
lilypond-devel mailing list
lilypond-devel <at> gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
Permalink | Reply |
headers
Peekay Ex | 1 Nov 2011 14:32
Picon

Re: patches to apply

Julien,

On Tue, Nov 1, 2011 at 12:22 AM, Julien Rioux
<jrioux <at> physics.utoronto.ca> 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.

 <at> graham etc. is this something I would push to dev/staging?

--

-- 
--
James
Permalink | Reply |
headers
Graham Percival | 1 Nov 2011 14:37
Picon
Favicon

Re: patches to apply

On Tue, Nov 01, 2011 at 01:32:13PM +0000, Peekay Ex wrote:
> On Tue, Nov 1, 2011 at 12:22 AM, Julien Rioux
> <jrioux <at> physics.utoronto.ca> 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 time came to push them.
> 
> I can push these.
> 
>  <at> graham etc. is this something I would push to dev/staging?

yes, please do.  I kept on getting patch application conflicts for
some reason.

- Graham
Permalink | Reply |
headers
David Kastrup | 1 Nov 2011 14:45
X-Face
Picon
Picon

Re: patches to apply

Graham Percival <graham <at> percival-music.ca> writes:

> On Tue, Nov 01, 2011 at 01:32:13PM +0000, Peekay Ex wrote:
>> On Tue, Nov 1, 2011 at 12:22 AM, Julien Rioux
>> <jrioux <at> physics.utoronto.ca> 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 time came to push them.
>> 
>> I can push these.
>> 
>>  <at> graham etc. is this something I would push to dev/staging?
>
> yes, please do.  I kept on getting patch application conflicts for
> some reason.

Well, people commit "little" changes to master directly all the time,
and then dev/staging is no longer a descendant of master.

In the last quarter of an hour, I have probably rebased and repushed
dev/staging half a dozen times.  Currently it is a proper descendant of
master again, but that state will not likely persist more than ten
minutes.

--

-- 
David Kastrup
Permalink | Reply |
headers
Peekay Ex | 1 Nov 2011 14:52
Picon

Re: patches to apply

Hello,

On Tue, Nov 1, 2011 at 1:45 PM, David Kastrup <dak <at> gnu.org> wrote:
> Graham Percival <graham <at> percival-music.ca> writes:
>
>> On Tue, Nov 01, 2011 at 01:32:13PM +0000, Peekay Ex wrote:
>>> On Tue, Nov 1, 2011 at 12:22 AM, Julien Rioux
>>> <jrioux <at> physics.utoronto.ca> 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 time came to push them.
>>>
>>> I can push these.
>>>
>>>  <at> graham etc. is this something I would push to dev/staging?
>>
>> yes, please do.  I kept on getting patch application conflicts for
>> some reason.
>
> Well, people commit "little" changes to master directly all the time,

:"(

> and then dev/staging is no longer a descendant of master.

Yes and I suppose that is why I cannot push these patches to dev\staging

--snip--

jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git push origin
(Continue reading)

Permalink | Reply |
headers
David Kastrup | 1 Nov 2011 15:10
X-Face
Picon
Picon

Re: patches to apply

Peekay Ex <pkx166h <at> gmail.com> writes:

> Yes and I suppose that is why I cannot push these patches to dev\staging
>
> --snip--
>
> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git push origin
> HEAD:refs/heads/dev/staging
> To ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git
>  ! [rejected]        HEAD -> dev/staging (non-fast-forward)
> error: failed to push some refs to
> 'ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
> --snip--
>
> Is there something I can do on my side to push these to dev\staging?

For single patches, this is reasonably simple.  First do

git rebase origin/dev/staging

and then push.  This flattens out merge commits however.  If you want to
preserve merges as merges (because the state in between is untested or
known to break tests), you need to do

git rebase -p origin/dev/staging

If you merge commits in between, it will likely bomb out complaining
(Continue reading)

Permalink | Reply |
headers
Peekay Ex | 1 Nov 2011 16:40
Picon

Re: patches to apply

On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup <dak <at> gnu.org> wrote:
> Peekay Ex <pkx166h <at> gmail.com> writes:
>
>> Yes and I suppose that is why I cannot push these patches to dev\staging
>>
>> --snip--
>>
>> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git push origin
>> HEAD:refs/heads/dev/staging
>> To ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git
>>  ! [rejected]        HEAD -> dev/staging (non-fast-forward)
>> error: failed to push some refs to
>> 'ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git'
>> To prevent you from losing history, non-fast-forward updates were rejected
>> Merge the remote changes before pushing again.  See the 'Note about
>> fast-forwards' section of 'git push --help' for details.
>> --snip--
>>
>> Is there something I can do on my side to push these to dev\staging?
>
> For single patches, this is reasonably simple.  First do
>
> git rebase origin/dev/staging

I got an error:

jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git rebase origin/dev/staging
fatal: Needed a single revision
invalid upstream origin/dev/staging
(Continue reading)

Permalink | Reply |
headers
David Kastrup | 1 Nov 2011 16:55
X-Face
Picon
Picon

Re: patches to apply

Peekay Ex <pkx166h <at> gmail.com> writes:

> On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup <dak <at> gnu.org> wrote:
>> Peekay Ex <pkx166h <at> gmail.com> writes:
>>
>>> Yes and I suppose that is why I cannot push these patches to dev\staging
>>>
>>> --snip--
>>>
>>> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git push origin
>>> HEAD:refs/heads/dev/staging
>>> To ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git
>>>  ! [rejected]        HEAD -> dev/staging (non-fast-forward)
>>> error: failed to push some refs to
>>> 'ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git'
>>> To prevent you from losing history, non-fast-forward updates were rejected
>>> Merge the remote changes before pushing again.  See the 'Note about
>>> fast-forwards' section of 'git push --help' for details.
>>> --snip--
>>>
>>> Is there something I can do on my side to push these to dev\staging?
>>
>> For single patches, this is reasonably simple.  First do
>>
>> git rebase origin/dev/staging
>
> I got an error:
>
> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git rebase origin/dev/staging
> fatal: Needed a single revision
(Continue reading)

Permalink | Reply |
headers
Peekay Ex | 1 Nov 2011 23:30
Picon

Re: patches to apply

David,

On Tue, Nov 1, 2011 at 3:55 PM, David Kastrup <dak <at> gnu.org> wrote:
> Peekay Ex <pkx166h <at> gmail.com> writes:
>
>> On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup <dak <at> gnu.org> wrote:
>>> Peekay Ex <pkx166h <at> gmail.com> writes:
>>>
>>>> Yes and I suppose that is why I cannot push these patches to dev\staging
>>>>
>>>> --snip--
>>>>
>>>> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git push origin
>>>> HEAD:refs/heads/dev/staging
>>>> To ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git
>>>>  ! [rejected]        HEAD -> dev/staging (non-fast-forward)
>>>> error: failed to push some refs to
>>>> 'ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git'
>>>> To prevent you from losing history, non-fast-forward updates were rejected
>>>> Merge the remote changes before pushing again.  See the 'Note about
>>>> fast-forwards' section of 'git push --help' for details.
>>>> --snip--
>>>>
>>>> Is there something I can do on my side to push these to dev\staging?
>>>
>>> For single patches, this is reasonably simple.  First do
>>>
>>> git rebase origin/dev/staging
>>
>> I got an error:
(Continue reading)

Permalink | Reply |
headers
Carl Sorensen | 1 Nov 2011 23:42

Re: patches to apply


On 11/1/11 4:30 PM, "Peekay Ex" <pkx166h <at> gmail.com> wrote:

>David,
>
>On Tue, Nov 1, 2011 at 3:55 PM, David Kastrup <dak <at> gnu.org> wrote:
>> Peekay Ex <pkx166h <at> gmail.com> writes:
>>
>>> On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup <dak <at> gnu.org> wrote:
>>>> Peekay Ex <pkx166h <at> gmail.com> writes:
>>>>
>>>>> Yes and I suppose that is why I cannot push these patches to
>>>>>dev\staging
>>>>>
>>>>> --snip--
>>>>>
>>>>> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git push origin
>>>>> HEAD:refs/heads/dev/staging
>>>>> To ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git
>>>>>  ! [rejected]        HEAD -> dev/staging (non-fast-forward)
>>>>> error: failed to push some refs to
>>>>> 'ssh://pkx166h <at> git.sv.gnu.org/srv/git/lilypond.git'
>>>>> To prevent you from losing history, non-fast-forward updates were
>>>>>rejected
>>>>> Merge the remote changes before pushing again.  See the 'Note about
>>>>> fast-forwards' section of 'git push --help' for details.
>>>>> --snip--
>>>>>
>>>>> Is there something I can do on my side to push these to dev\staging?
>>>>
(Continue reading)

Permalink | Reply |
headers
Peekay Ex | 2 Nov 2011 06:45
Picon

Re: patches to apply

Carl,

On Tue, Nov 1, 2011 at 10:42 PM, Carl Sorensen <c_sorensen <at> byu.edu> wrote:
>
>
> On 11/1/11 4:30 PM, "Peekay Ex" <pkx166h <at> gmail.com> wrote:
>
>>David,
>>
>>On Tue, Nov 1, 2011 at 3:55 PM, David Kastrup <dak <at> gnu.org> wrote:
..
>>>>>
>>>>> For single patches, this is reasonably simple.  First do
>>>>>
>>>>> git rebase origin/dev/staging
>>>>
>>>> I got an error:
>>>>
>>>> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git rebase origin/dev/staging
>>>> fatal: Needed a single revision
>>>> invalid upstream origin/dev/staging
>>>
>>> Well, use whatever your tracking branch is called.  What does
>>> git branch -r
>>> say?
>>
>>jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git branch -r
>>  origin/HEAD -> origin/master
>>  origin/master
>
(Continue reading)

Permalink | Reply |
headers
David Kastrup | 2 Nov 2011 07:01
X-Face
Picon
Picon

Re: patches to apply

Peekay Ex <pkx166h <at> gmail.com> writes:

>>>> Well, use whatever your tracking branch is called.  What does
>>>> git branch -r
>>>> say?
>>>
>>>jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git branch -r
>>>  origin/HEAD -> origin/master
>>>  origin/master
>>
>>
>> I would do:
>>
>> git checkout dev/staging
>> git push origin dev/staging
>>
>> In order to get my changes into dev/staging on origin.
>>
>
> Unfortunately not, I get
>
> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git checkout dev/staging
> error: pathspec 'dev/staging' did not match any file(s) known to git.
>
> --snip--
>
> I need to do some more homework on GIT and Branches.

You just don't have any branches except master on your computer.
(Continue reading)

Permalink | Reply |
headers
Peekay Ex | 2 Nov 2011 14:22
Picon

Re: patches to apply

David/Carl

On Wed, Nov 2, 2011 at 6:01 AM, David Kastrup <dak <at> gnu.org> wrote:
> Peekay Ex <pkx166h <at> gmail.com> writes:
>
>>>>> Well, use whatever your tracking branch is called.  What does
>>>>> git branch -r
>>>>> say?
>>>>
>>>>jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git branch -r
>>>>  origin/HEAD -> origin/master
>>>>  origin/master
>>>
>>>
>>> I would do:
>>>
>>> git checkout dev/staging
>>> git push origin dev/staging
>>>
>>> In order to get my changes into dev/staging on origin.
>>>
>>
>> Unfortunately not, I get
>>
>> jlowe <at> jlowe-lilybuntu2:~/lilypond-git$ git checkout dev/staging
>> error: pathspec 'dev/staging' did not match any file(s) known to git.
>>
>> --snip--
>>
>> I need to do some more homework on GIT and Branches.
(Continue reading)

Permalink | Reply |
headers
Julien Rioux | 2 Nov 2011 15:16
Picon
Picon
Favicon

Re: patches to apply

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
Permalink | Reply |

Gmane