Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ==> git-bloom-generate -y rosrelease indigo --source upstream -i 0
- Releasing packages: ['ihmc_ros_common', 'ihmc_ros_java_adapter', 'ihmc_ros_core', 'ihmc_msgs']
- Releasing package 'ihmc_ros_common' for 'indigo' to: 'release/indigo/ihmc_ros_common'
- Releasing package 'ihmc_ros_java_adapter' for 'indigo' to: 'release/indigo/ihmc_ros_java_adapter'
- [git-bloom-patch import]: 'execute_command' failed to call 'git am /tmp/tmpN2tRPH/*.patch' which had a return code (128):
- [git-bloom-patch import]: ```
- Applying: Add FILES_MATCHING to the install rule
- error: patch failed: CMakeLists.txt:14
- error: CMakeLists.txt: patch does not apply
- Patch failed at 0001 Add FILES_MATCHING to the install rule
- The copy of the patch that failed is found in: .git/rebase-apply/patch
- When you have resolved this problem, run "git am --continue".
- If you prefer to skip this patch, run "git am --skip" instead.
- To restore the original branch and stop patching, run "git am --abort".
- [git-bloom-patch import]: ```
- [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.
- >>> Resolve any conflicts and when you have resolved this problem run 'git am --resolved' and then exit the shell using 'exit 0'. <<<
- To abort use 'exit 1'
- (bloom)cat .git/rebase-apply/patch
- ---
- CMakeLists.txt | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index 2fb6816..de5f600 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -14,10 +14,11 @@ catkin_package(
- install(DIRECTORY .
- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
- - PATTERN "*.gradle"
- - PATTERN "gradle/*"
- - PATTERN "buildSrc/*"
- - PATTERN "gradlew"
- + FILES_MATCHING
- + PATTERN "*.gradle"
- + PATTERN "gradle/*"
- + PATTERN "buildSrc/*"
- + PATTERN "gradlew"
- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
- GROUP_EXECUTE GROUP_READ
- )
- --
- 2.7.4
- (bloom)exit
- [git-bloom-patch import]: User reports that conflicts have been resolved, continuing.
- [git-bloom-patch import]: Applied 10 patches
- Releasing package 'ihmc_ros_core' for 'indigo' to: 'release/indigo/ihmc_ros_core'
- Releasing package 'ihmc_msgs' for 'indigo' to: 'release/indigo/ihmc_msgs'
- [git-bloom-patch import]: 'execute_command' failed to call 'git am /tmp/tmpW9tvtD/*.patch' which had a return code (128):
- [git-bloom-patch import]: ```
- fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
- [git-bloom-patch import]: ```
- [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