Advertisement
Guest User

Untitled

a guest
Feb 23rd, 2017
75
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 2.69 KB | None | 0 0
  1. ==> git-bloom-generate -y rosrelease indigo --source upstream -i 0
  2. Releasing packages: ['ihmc_ros_common', 'ihmc_ros_java_adapter', 'ihmc_ros_core', 'ihmc_msgs']
  3. Releasing package 'ihmc_ros_common' for 'indigo' to: 'release/indigo/ihmc_ros_common'
  4. Releasing package 'ihmc_ros_java_adapter' for 'indigo' to: 'release/indigo/ihmc_ros_java_adapter'
  5.  [git-bloom-patch import]: 'execute_command' failed to call 'git am /tmp/tmpN2tRPH/*.patch' which had a return code (128):
  6.  [git-bloom-patch import]: ```
  7. Applying: Add FILES_MATCHING to the install rule
  8. error: patch failed: CMakeLists.txt:14
  9. error: CMakeLists.txt: patch does not apply
  10. Patch failed at 0001 Add FILES_MATCHING to the install rule
  11. The copy of the patch that failed is found in: .git/rebase-apply/patch
  12. When you have resolved this problem, run "git am --continue".
  13. If you prefer to skip this patch, run "git am --skip" instead.
  14. To restore the original branch and stop patching, run "git am --abort".
  15.  
  16.  [git-bloom-patch import]: ```
  17.  [git-bloom-patch import]: Failed to apply one or more patches for the 'Command 'git am /tmp/tmpN2tRPH/*.patch' returned non-zero exit status 128' branch.
  18.  
  19.  
  20. >>> Resolve any conflicts and when you have resolved this problem run 'git am --resolved' and then exit the shell using 'exit 0'. <<<
  21.     To abort use 'exit 1'
  22. (bloom)cat .git/rebase-apply/patch
  23. ---
  24.  CMakeLists.txt | 9 +++++----
  25.  1 file changed, 5 insertions(+), 4 deletions(-)
  26.  
  27. diff --git a/CMakeLists.txt b/CMakeLists.txt
  28. index 2fb6816..de5f600 100644
  29. --- a/CMakeLists.txt
  30. +++ b/CMakeLists.txt
  31. @@ -14,10 +14,11 @@ catkin_package(
  32.  
  33.  install(DIRECTORY .
  34.    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
  35. -  PATTERN "*.gradle"
  36. -  PATTERN "gradle/*"
  37. -  PATTERN "buildSrc/*"
  38. -  PATTERN "gradlew"
  39. +  FILES_MATCHING
  40. +    PATTERN "*.gradle"
  41. +    PATTERN "gradle/*"
  42. +    PATTERN "buildSrc/*"
  43. +    PATTERN "gradlew"
  44.    PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
  45.                      GROUP_EXECUTE GROUP_READ
  46.  )
  47. --
  48. 2.7.4
  49.  
  50. (bloom)exit
  51.  [git-bloom-patch import]: User reports that conflicts have been resolved, continuing.
  52.  [git-bloom-patch import]: Applied 10 patches
  53. Releasing package 'ihmc_ros_core' for 'indigo' to: 'release/indigo/ihmc_ros_core'
  54. Releasing package 'ihmc_msgs' for 'indigo' to: 'release/indigo/ihmc_msgs'
  55.  [git-bloom-patch import]: 'execute_command' failed to call 'git am /tmp/tmpW9tvtD/*.patch' which had a return code (128):
  56.  [git-bloom-patch import]: ```
  57. fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
  58.  
  59.  [git-bloom-patch import]: ```
  60.  [git-bloom-patch import]: Failed to apply one or more patches for the 'Command 'git am /tmp/tmpW9tvtD/*.patch' returned non-zero exit status 128' branch.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement