Re: rebasing inside staging

[David Kastrup]

Graham Percival <address@hidden> writes:

> Compile of staging dies due to:
>
>
> baf650c616cf73ab8ee47e28b298f7d7e1336867
> Author: Adam Spiers <address@hidden>  2011-07-28 00:51:12
> Committer: Adam Spiers <address@hidden>  2011-11-28
> 09:31:44
> Parent: c8e6f4dbdbe2932504aa294394862728cff0ba5c (Replace tabs
> with spaces in scm/chord-ignatzek-names.scm)
> Child:  baf650c616cf73ab8ee47e28b298f7d7e1336867 (Issue 1503 -
> Recognise Lydian chords)
> Branches: remotes/origin/staging, staging, test-master-lock,
> test-staging
> Follows: release/2.15.20-1
> Precedes: 
>
>     Issue 1503 - Enlarge half-diminished slashed circle symbol
>
> -------------------------- ly/chord-modifiers-init.ly
> --------------------------
> index 21d6b56..efc2445 100644
> @@ -27,7 +27,7 @@ ignatzekExceptionMusic = {
>    <c es ges>-\markup { \super "o" } % should be $\circ$ ?
>    <c es ges bes>-\markup {
>      %%  f8 is o with slash.
> -    \super $(ly:wide-char->utf-8 #x00f8)
> +    \normal-size-super (ly:wide-char->utf-8 #x00f8))
>    }
>    <c es ges beses>-\markup { \super  "o7" }
>  }
>
>
>
> I suspect it needs a $ in front of the (ly:wide-char...
> stuff.

These days, a # should suffice.

commit 0f59cb098b500005efe0b6910dc8ff497571c676
Author: David Kastrup <address@hidden>
Date:   Wed Nov 16 23:18:35 2011 +0100

    Allow embedded Scheme inside of markup expressions


> Could somebody who knows git either:
> 1) modify that commit to add the $ (if you're certain that'll
> fix it), or
> 2) remove that commit, then rebase origin/staging on the result.
>
> I'm not comfortable rewriting history on a shared repository.

I'll do the second one.  Rewriting history is easy, and that is what
staging is for.  The aftermath will be more interesting.  People
committing to staging (and rebasing on staging) should double-check that
they are only committing their own commits and not old commits we chose
to back out.

If there are problems, we'll walk through them and try to figure out
procedures for doing that nicely.

An interesting question is how the commit could
a) acquire changes not at all described in the commit message
b) pass testing and acquire "Push" status

-- 
David Kastrup