Comment 0 for bug 893495

I was merging lp:ubuntu/gcc-4.6 into my lp:~hrw/ubuntu/precise/gcc-4.6/cross-fixes branch and as result I got debian/changelog dropped to 0 size:

09:29 hrw@puchatek:gcc-4.6-my-cross-fixes$ bzr merge lp:ubuntu/gcc-4.6
Most recent Ubuntu version: 4.6.2-5ubuntu1
Packaging branch status: CURRENT
Traceback (most recent call last):e merge 1/16
  File "/usr/lib/python2.7/logging/__init__.py", line 865, in emit
    stream.write(fs % msg.encode("UTF-8"))
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position 23: ordinal not in range(128)
Logged from file merge_changelog.py, line 73
+N debian/patches/gcc-multilib64-multiarch-trunk.diff
+N debian/patches/gcc-powerpc-nof-trunk.diff
+N debian/patches/libffi-powerpc-sysv-without-string-ops.diff
 M debian/changelog
 M debian/control
 M debian/control.m4
-D debian/patches/arm-unbreak-eabi-armv4t.diff
 M debian/patches/armhf-triplet-trunk.diff
 M debian/patches/gcc-multiarch.diff
 M debian/patches/svn-updates-linaro.diff
 M debian/patches/svn-updates.diff
 M debian/rules.conf
 M debian/rules.defs
 M debian/rules.parameters
 M debian/rules.patch
 M debian/rules2
Text conflict in debian/control.m4
Text conflict in debian/rules2
2 conflicts encountered.

09:54 hrw@puchatek:debian$ bzr diff|diffstat
 changelog |10138 --------------------

According to mgz from #bzr bug is in a way how bzr-builddep/merge_changelog.py uses logger. After changing code I got:

10:08 hrw@puchatek:debian$ LC_ALL=C bzr remerge changelog
debian/changelog is not conflicted
dpkg-mergechangelogs: warning: /tmp/tmpiGP5_Sdeb_changelog_merge/changelog.this(l0): found eof where expected first heading
dpkg-mergechangelogs: error: ss-970814-1 is not a valid version

All changes applied successfully.

And changelog file was still empty.

Change was in/usr/share/pyshared/bzrlib/plugins/builddeb/merge_changelog.py file (line 73):

- _logger.warning('%s', stderr)
+ _logger.warning('%s', stderr.decode("utf-8", "replace"))

ProblemType: Bug
DistroRelease: Ubuntu 12.04
Package: bzr-builddeb 2.7.9ubuntu1
ProcVersionSignature: Ubuntu 3.1.0-2.3-generic 3.1.0
Uname: Linux 3.1.0-2-generic x86_64
ApportVersion: 1.26-0ubuntu1
Architecture: amd64
Date: Tue Nov 22 09:52:45 2011
InstallationMedia: Kubuntu 10.04 "Lucid Lynx" - Release Candidate amd64 (20100419.1)
PackageArchitecture: all
SourcePackage: bzr-builddeb
UpgradeStatus: No upgrade log present (probably fresh install)