Re: How to update a remote branch (remotes/origin/dev/guile-v2-work)

[Thomas Morley]

2018-06-08 0:40 GMT+02:00 Thomas Morley <address@hidden>:
> 2018-06-08 0:36 GMT+02:00 David Kastrup <address@hidden>:
>> Thomas Morley <address@hidden> writes:
>>
>>> One additional question: If I want to add something to the then
>>> updated branch, would
>>> $ git push origin HEAD:dev/guile-v2-work
>>> work or would I need to follow the route you described above?
>>
>> As long as you don't rebase, your followup work is a descendant of the
>> previous work and can be pushed without deletion.
>>
>> --
>> David Kastrup
>
> Ok
> I'll check for `make doc' tomorrow and, if successful, will push the
> rebased branch afterwards.
>
> Thanks again,
>   Harm

`make doc' succeeded.

Also I did a regtest-comparison between a guile1-build from master and
a guile-2.2.3-build form said branch.
Only the usual candidates pop up, i.e. test-output-distance.ly and
rest-dot-position.ly.
While searching for `error' in the logs, there may be two regtests
needing further investigation:

safe.ly

If I understand correctly safe.ly should fail. Thus the log looks ok to me:

@@ -1,13 +1,16 @@
 Processing `./safe.ly'
 Parsing...
-Renaming input to: `/home/hermann/lilypond-git/input/regression/safe.ly'
-/home/hermann/lilypond-git/input/regression/safe.ly:14:6: error:
GUILE signaled an error for the expression beginning here
+Renaming input to:
`/home/hermann/lilypond-git-guile-2.2/input/regression/safe.ly'
+/home/hermann/lilypond-git-guile-2.2/input/regression/safe.ly:14:6:
error: GUILE signaled an error for the expression beginning here
     #
      (open-file "w")
-/home/hermann/lilypond-git/input/regression/safe.ly:18:2: error:
GUILE signaled an error for the expression beginning here
+Processing safe
+Unbound variable: open-file
+/home/hermann/lilypond-git-guile-2.2/input/regression/safe.ly:18:2:
error: GUILE signaled an error for the expression beginning here
 #
  (open-file "/tmp/safe-guile.scm")
-/home/hermann/lilypond-git/input/regression/safe.ly:20:10: error:
include files are not allowed in safe mode
+Unbound variable: open-file
+/home/hermann/lilypond-git-guile-2.2/input/regression/safe.ly:20:10:
error: include files are not allowed in safe mode
 \include
          "this-should-fail.ly"
 Writing header field `texidoc' to `./safe.texidoc'...
@@ -16,6 +19,3 @@
 Writing ./safe-systems.tex...
 Writing ./safe-systems.count...
 Writing timing to safe.profile...
-Processing safe
-Unbound variable: open-file
-Unbound variable: open-file


beam-quant-standard.ly

This log looks ok to me as well.
Though, the regtest itself states
"%% FIXME: This file should actually NOT produce any warnings!"

@@ -1,6 +1,6 @@
 Processing `./beam-quant-standard.ly'
 Parsing...
-Renaming input to:
`/home/hermann/lilypond-git/input/regression/beam-quant-standard.ly'
+Renaming input to:
`/home/hermann/lilypond-git-guile-2.2/input/regression/beam-quant-standard.ly'
 Interpreting music...[8][16][24]
 Preprocessing graphical objects...
 Calculating line breaks...
@@ -9,7 +9,7 @@
 warning: Error in beam quanting.  Expected (-0.19,-0.19) found (0.0 . 0.0).
 warning: Error in beam quanting.  Expected (-0.19,-0.19) found (0.0 . 0.0).
 warning: Error in beam quanting.  Expected (-0.19,-0.19) found (0.0 . 0.0).
-warning: Error in beam quanting.  Expected (3,3) found (3.5 . 3.5).
+warning: Error in beam quanting.  Expected (3.0,3.0) found (3.5 . 3.5).
 Writing header field `texidoc' to `./beam-quant-standard.texidoc'...
 Writing ./beam-quant-standard-1.signature
 Writing ./beam-quant-standard-2.signature


So I'd like the to push said rebased and amended branch to update
dev/guile-v2-work.

Though, Wol's mail (I didn't understand it entirely) made me think I
better ask again for any objections.

Cheers,
  Harm