On 2011/07/30 22:59:11, Reinhold wrote:
I think that you forgot to rebase your branch to origin/master before
uploading
that patch. Your version does not have some of the latest patches in
the git
tree, so it appears that you are reverting some of those patches.
http://codereview.appspot.com/4808063/diff/1/scm/define-markup-commands.scm
File scm/define-markup-commands.scm (left):
http://codereview.appspot.com/4808063/diff/1/scm/define-markup-commands.scm#oldcode1491
scm/define-markup-commands.scm:1491: (ly:stencil-translate-axis
stacked-stencil
(- (car stacked-extent)) X ))) Are you sure you want to revert this patch of mine?
http://codereview.appspot.com/4808063/diff/1/scm/define-markup-commands.scm#oldcode1966
scm/define-markup-commands.scm:1966: main-stencil Same goes here... Have you rebased your git branch to origin/master
before
running "git cl upload origin/master"? It seems your current branch
does not
have some of the latest patches.
Nice catch, Reinhold, I'll re-implement David's patch after a re-base and upload another patchset for review. Ian http://codereview.appspot.com/4808063/ _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
