Linaro GCC

binary files are not merged from the fsf branches

Bug #1053348 reported by Matthias Klose on 2012-09-20

This bug affects 1 person

Affects		Status	Importance	Assigned to	Milestone
	Linaro GCC	Fix Released	Medium	Matthew Gretton-Dann	Linaro GCC 4.7-2012.10

Bug Description

some are not present at all, some are not merged. I didn't check for files outside from libgo. Might be worth checking the libjava .class files. Because Linaro didn't change anything in libjava, these .class files should be the same on the FSF branches. Probably needs checking for all active branches.

$ find svn/gcc-4_7-branch/libgo -name '*.zip' | xargs md5sum
c405e9ec3c7566b1b42e5d52fd916619 svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/symlink.zip
0e5c6061f34579a29cd9e706200e3fc5 svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/crc32-not-streamed.zip
a0dc0660d6847cfdefd1e34811fa3e2a svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/dd.zip
d8df365fbb6fac417a9fbde8585a9270 svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/test.zip
abb58ce61c08e3f2b2498ee654e13589 svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/go-no-datadesc-sig.zip
384be2e5e01c2618a144579f16ba024b svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/winxp.zip
635dafd33ae9055a552e1e397f04a204 svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/go-with-datadesc-sig.zip
0961cbf58a849bc5541cf7ca2609ba4e svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/readme.zip
f1dcd13397f7e578380b3fa564156b46 svn/gcc-4_7-branch/libgo/go/archive/zip/testdata/unix.zip

$ find bzr/4.7/libgo -name '*.zip' | xargs md5sum
c405e9ec3c7566b1b42e5d52fd916619 bzr/4.7/libgo/go/archive/zip/testdata/symlink.zip
1d22c4a605c19602e41ec9726a74b949 bzr/4.7/libgo/go/archive/zip/testdata/r.zip
a0dc0660d6847cfdefd1e34811fa3e2a bzr/4.7/libgo/go/archive/zip/testdata/dd.zip
d8df365fbb6fac417a9fbde8585a9270 bzr/4.7/libgo/go/archive/zip/testdata/test.zip
384be2e5e01c2618a144579f16ba024b bzr/4.7/libgo/go/archive/zip/testdata/winxp.zip
0961cbf58a849bc5541cf7ca2609ba4e bzr/4.7/libgo/go/archive/zip/testdata/readme.zip
f1dcd13397f7e578380b3fa564156b46 bzr/4.7/libgo/go/archive/zip/testdata/unix.zip

Related branches

lp://staging/~matthew-gretton-dann/gcc-linaro/4.7-add-missing-files

Merged into lp://staging/gcc-linaro/4.7 at revision 115024

Christophe Lyon: Approve on 2012-10-03

Matthew Gretton-Dann (matthew-gretton-dann) on 2012-10-02

Changed in gcc-linaro:
milestone:	none → 4.7-2012.10
assignee:	nobody → Matthew Gretton-Dann (matthew-gretton-dann)
status:	New → In Progress

Revision history for this message

Matthew Gretton-Dann (matthew-gretton-dann) wrote on 2012-10-02:

This is an artefact of manually merging lp:gcc/4.7 into lp:gcc-linaro/4.7. Using bzr diff doesn't produce diffs for binary files only for text files.

The solution is to manually update the binary files, and then update the merge process to take note of this for future reference.

Revision history for this message

Matthew Gretton-Dann (matthew-gretton-dann) wrote on 2012-10-03:

Fixed - a scan of the repos showed only the libgo files were incorrect.

Changed in gcc-linaro:
importance:	Undecided → Medium
status:	In Progress → Won't Fix
status:	Won't Fix → Fix Committed

Matthew Gretton-Dann (matthew-gretton-dann) on 2012-10-11

Changed in gcc-linaro:
status:	Fix Committed → Fix Released

Report a bug

This report contains Public information

Everyone can see this information.

You are

Subscribing...

Edit bug mail

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.