Advertisement
Guest User

Untitled

a guest
Dec 13th, 2011
22
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.13 KB | None | 0 0
  1. 17:46 hrw@puchatek:gcc-linaro-ci-native$ bzr merge lp:ubuntu/precise/gcc-4.6
  2. Most recent Ubuntu Precise version: 4.6.2-7ubuntu1
  3. Packaging branch status: CURRENT
  4. dpkg-mergechangelogs: błąd: ss-970814-1 is not a valid version
  5.  
  6. +N debian/patches/arm-dynamic-linker-trunk.diff
  7. +N debian/patches/gcc-multilib64-multiarch-trunk.diff
  8. +N debian/patches/gcc-powerpc-nof-trunk.diff
  9. +N debian/patches/libffi-powerpc-sysv-without-string-ops.diff
  10. +N debian/patches/pr49030.diff
  11. +N debian/patches/pr50114.diff
  12. +N debian/patches/pr50193.diff
  13. M debian/changelog
  14. M debian/control
  15. M debian/control.m4
  16. -D debian/patches/01-arm-64bitintrinsics-v2.diff
  17. -D debian/patches/02-arm-64bitsynchelpers-v2.diff
  18. -D debian/patches/03-arm-pr48126-syncpos-v2.diff
  19. -D debian/patches/04-arm-dmbmcr.diff
  20. -D debian/patches/arm-unbreak-eabi-armv4t.diff
  21. M debian/patches/armhf-triplet-trunk.diff
  22. M debian/patches/gcc-base-version.diff
  23. -D debian/patches/gcc-dw2-loc-tracking.diff
  24. M debian/patches/gcc-linaro-doc.diff
  25. M debian/patches/gcc-linaro.diff
  26. M debian/patches/gcc-multiarch.diff
  27. M debian/patches/svn-updates-linaro.diff
  28. M debian/patches/svn-updates.diff
  29. M debian/rules.conf
  30. M debian/rules.d/binary-libstdcxx.mk
  31. M debian/rules.d/binary-snapshot.mk
  32. M debian/rules.defs
  33. M debian/rules.parameters
  34. M debian/rules.patch
  35. M debian/rules.unpack
  36. M debian/rules2
  37. Text conflict in debian/control
  38. Text conflict in debian/control.m4
  39. Text conflict in debian/rules.conf
  40. Text conflict in debian/rules.d/binary-snapshot.mk
  41. Text conflict in debian/rules.defs
  42. Text conflict in debian/rules.patch
  43. Text conflict in debian/rules.unpack
  44. Text conflict in debian/rules2
  45. 8 conflicts encountered.
  46.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement