David Nalesnik <david.nales...@gmail.com> writes:
> On Wed, Jan 11, 2017 at 10:25 AM, Trevor Daniels <tr...@treda.co.uk> wrote:
>>
>> David Nalesnik wrote Wednesday, January 11, 2017 3:22 PM
>>
>>
>>> Ok, so I will probably do
>>>
>>> git revert HEAD
>>>
>>> in my staging branch
>>>
>>> and push it to origin/staging.
>>>
>>> -------
>>>
>>> I won't attempt to clear the LSR queue in preparation for my patch
>>> update (as I did) by running makelsr.py again.
>>>
>>> When I update my issue, I'll simply add my snippet to snippets/new,
>>> and leave updating the LSR to the future (when the frenched-score
>>> snippet and my proposed snippet and whatever else appears will be
>>> integrated)
>>
>> Sorry my recipe caused a problem in this case. Normally clearing
>> the old LSR queue first with makelsr.py would be fine. But what
>> you suggest is also OK, as long as someone fixes the problem and
>> runs makelsr.py reasonably soon - before the next new snippet is
>> added (I can't run it myself - on my Windows Vista it always tries
>> to change all the \ to / or vice versa.)
>>
>
> I think the only problem is that @{MarkLines} should be replaced with
> @code{MarkLines}.
>
> I'm stuck in the middle of a make doc checking the change. When I'm
> through that, I'll revert the update.
>
> Then I can push an update of the snippet to staging. (But I'll save
> the makelsr for later as James says.)
>
> No problem, it's all a learning experience for me!
It's nicer to _remove_ the patch from staging instead of adding the
revert on top. However, that requires more skills. I can offer to do
this, but you'll still need to remove the patch on your side before
trying to push anything else.
--
David Kastrup
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
