Re: [Libcdio-devel] Unmerged branch ts-cdtext-fix

[Thomas Schmitt]

Hi,

it looks like the two commits
  bde2647b444136e2d23d303d0a02d27383fcea32
  6347ef09b6d1a6211b93425bd9b12b9d92b34e8c
were overridden by newer changes.

  git merge bde2647b444136e2d23d303d0a02d27383fcea32
replied
  Already up-to-date.

Closer inspection of the code shows that the removal of trailing blanks
in bde2647b444136e2d23d303d0a02d27383fcea32 is in "master" and that the
old text "Get binary CD-Text information for a CdIo_t object." is replaced
by a three-liner which still has the wrong "for" which i want to change to
"from".
(I had expected that git merge sees this as noteworthy conflict.)

The added comment lines of 6347ef09b6d1a6211b93425bd9b12b9d92b34e8c are
not only missing, but the whole function language_code_tests() is gone.
So the comment is not needed any more.


Now i riddle how i could again bring my word change "for" -> "from" into
file include/cdio/disc.h .
Shall i wait until branch "ts-cdtext-fix" is reviewed and merged ?

In my merge test branch, make check says: "PASS: cdtext"


Have a nice day :)

Thomas