On 5 July 2012 02:42, Matthias Klose doko@ubuntu.com wrote:

Hi,

I didn't look if the files were correctly merged or not. but the .orig and .rej files don't belong here.

It might be worth to update the merge to r189186, reverting the c++98/c++11 ABI incompatibility in std::list.

Matthias

revno: 115001 [merge] committer: Michael Hope michael.hope@linaro.org branch nick: 4.7 timestamp: Tue 2012-07-03 20:16:55 +1200 message: Merge from FSF (GCC SVN branches/gcc-4_7-branch:189098) added: gcc/config.gcc.rej gcc/config/arm/arm.c.orig gcc/config/arm/arm.c.rej gcc/config/avr/avr-stdint.h gcc/configure.ac.rej gcc/configure.rej

Thanks. These came about as part of the manual merge. bzr broke a few months ago and will no longer merge between the lp:gcc/4.7 and lp:gcc-linaro/4.7 branches.

I've added a step to drop the patch artefacts and a test for any other unexpected files to the manual instructions at: https://wiki.linaro.org/WorkingGroups/ToolChain/BzrTips#How_to_do_a_manual_b...

I've added a automatic test to the release automation that will fail if there are any .rej, .orig, *~, or similar files.

-- Michael