Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 17:46 hrw@puchatek:gcc-linaro-ci-native$ bzr merge lp:ubuntu/precise/gcc-4.6
- Most recent Ubuntu Precise version: 4.6.2-7ubuntu1
- Packaging branch status: CURRENT
- dpkg-mergechangelogs: bÅÄ d: ss-970814-1 is not a valid version
- +N debian/patches/arm-dynamic-linker-trunk.diff
- +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
- +N debian/patches/pr49030.diff
- +N debian/patches/pr50114.diff
- +N debian/patches/pr50193.diff
- M debian/changelog
- M debian/control
- M debian/control.m4
- -D debian/patches/01-arm-64bitintrinsics-v2.diff
- -D debian/patches/02-arm-64bitsynchelpers-v2.diff
- -D debian/patches/03-arm-pr48126-syncpos-v2.diff
- -D debian/patches/04-arm-dmbmcr.diff
- -D debian/patches/arm-unbreak-eabi-armv4t.diff
- M debian/patches/armhf-triplet-trunk.diff
- M debian/patches/gcc-base-version.diff
- -D debian/patches/gcc-dw2-loc-tracking.diff
- M debian/patches/gcc-linaro-doc.diff
- M debian/patches/gcc-linaro.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.d/binary-libstdcxx.mk
- M debian/rules.d/binary-snapshot.mk
- M debian/rules.defs
- M debian/rules.parameters
- M debian/rules.patch
- M debian/rules.unpack
- M debian/rules2
- Text conflict in debian/control
- Text conflict in debian/control.m4
- Text conflict in debian/rules.conf
- Text conflict in debian/rules.d/binary-snapshot.mk
- Text conflict in debian/rules.defs
- Text conflict in debian/rules.patch
- Text conflict in debian/rules.unpack
- Text conflict in debian/rules2
- 8 conflicts encountered.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement