Re: Unable to run make on older releases, while doing bug-reseach

[Thomas Morley]

Am So., 23. Feb. 2020 um 13:50 Uhr schrieb Thomas Morley
<address@hidden>:
>
> Am So., 23. Feb. 2020 um 13:14 Uhr schrieb David Kastrup <address@hidden>:

> > Ah that abomination.  Sorry for seeing this only now.  You'll need to
> > cherry-pick
> >
> > commit 67cd07e55d5ec908c246ae543e480d367b61d6b3
> > Author: David Kastrup <address@hidden>
> > Date:   Fri Jun 3 14:21:55 2016 +0200
> >
> >     Issue 4878: Make type_p_name_ always char pointer
> >
> >     This avoids the pitfalls cured by issue 4783 without the
> >     associated inconvenience when no predicate is desired.
> >
> > every time, probably using git cherry-pick -n (in order not to confuse
> > bisection) followed by git reset --hard once you know whether the commit
> > is good or bad.
> >
> > Maybe we need to set up a branch of cherry-picks for getting older stuff
> > to compile on newer compilers.

> thanks for the hint, I'll try to narrow done the cause of my recent
> bugreport, then.

I first tried to get a git formated patch for
67cd07e55d5ec908c246ae543e480d367b61d6b3.
Then I tried
hermann@kasten ~/lilypond-git ((release/2.19.26-1))$ git am
0001-Issue-4878-Make-type_p_name_-always-char-pointer.patch
Returning a wagonlaod of
error: patch failed: lily/all-font-metrics.cc:27
error: lily/all-font-metrics.cc: patch does not apply
error: lily/callback.cc: does not exist in index
[...]

Second attempt (now from a custom-branch):
hermann@kasten ~/lilypond-git (dev/dynamic-grr)$ git cherry-pick -n
67cd07e55d5ec908c246ae543e480d367b61d6b3
returns:
error: could not apply 67cd07e55d... Issue 4878: Make type_p_name_
always char pointer
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'

git status
shows:

On branch dev/dynamic-grr
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    modified:   lily/book-scheme.cc
    modified:   lily/box.cc
    modified:   lily/context-def.cc
    modified:   lily/context-mod.cc
    modified:   lily/context-property.cc
    modified:   lily/context.cc
    modified:   lily/dispatcher.cc
    modified:   lily/duration.cc
    modified:   lily/font-metric.cc
    modified:   lily/grob-array.cc
    modified:   lily/grob-smob.cc
    modified:   lily/include/book.hh
    modified:   lily/include/box.hh
    modified:   lily/include/context-def.hh
    modified:   lily/include/context-mod.hh
    modified:   lily/include/context.hh
    modified:   lily/include/dispatcher.hh
    modified:   lily/include/duration.hh
    modified:   lily/include/font-metric.hh
    modified:   lily/include/grob-array.hh
    modified:   lily/include/grob.hh
    modified:   lily/include/input.hh
    modified:   lily/include/lily-lexer.hh
    modified:   lily/include/lily-parser.hh
    modified:   lily/include/listener.hh
    modified:   lily/include/moment.hh
    modified:   lily/include/music-function.hh
    modified:   lily/include/music-iterator.hh
    modified:   lily/include/music-output.hh
    modified:   lily/include/output-def.hh
    modified:   lily/include/page-marker.hh
    modified:   lily/include/paper-book.hh
    modified:   lily/include/pitch.hh
    modified:   lily/include/prob.hh
    modified:   lily/include/score.hh
    modified:   lily/include/skyline-pair.hh
    modified:   lily/include/skyline.hh
    modified:   lily/include/smobs.tcc
    modified:   lily/include/source-file.hh
    modified:   lily/include/spring.hh
    modified:   lily/include/stencil.hh
    modified:   lily/include/translator-group.hh
    modified:   lily/include/translator.hh
    modified:   lily/include/unpure-pure-container.hh
    modified:   lily/input-smob.cc
    modified:   lily/lily-lexer.cc
    modified:   lily/lily-parser.cc
    modified:   lily/listener.cc
    modified:   lily/moment.cc
    modified:   lily/music-function.cc
    modified:   lily/music-iterator.cc
    modified:   lily/music-output.cc
    modified:   lily/output-def-scheme.cc
    modified:   lily/page-marker.cc
    modified:   lily/paper-book.cc
    modified:   lily/pitch.cc
    modified:   lily/prob.cc
    modified:   lily/score.cc
    modified:   lily/skyline-pair.cc
    modified:   lily/skyline.cc
    modified:   lily/source-file.cc
    modified:   lily/spring-smob.cc
    modified:   lily/stencil.cc
    modified:   lily/translator-group.cc
    modified:   lily/translator.cc
    modified:   lily/undead.cc

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add/rm <file>..." as appropriate to mark resolution)

    deleted by us:   lily/include/callback.hh
    both modified:   lily/include/smobs.hh
    both modified:   lily/scm-hash.cc
    both modified:   lily/unpure-pure-container.cc

Too much for me, I gave up:
git reset --hard c4b6c3eca78a80e404b04d503f0b046483189b60


Sorry,
  Harm