Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- mateor@mateor-HP-m6:~/development/new_pants/pants$ ./rbt patch --diff-revision 5 1723
- Patch is being applied from request 1723 with diff revision 5.
- /tmp/tmpS_W30X:127: new blank line at EOF.
- +
- error: patch failed: src/python/pants/backend/jvm/register.py:12
- Falling back to three-way merge...
- Applied patch to 'src/python/pants/backend/jvm/register.py' with conflicts.
- error: patch failed: src/python/pants/backend/jvm/targets/jar_dependency.py:2
- Falling back to three-way merge...
- Applied patch to 'src/python/pants/backend/jvm/targets/jar_dependency.py' cleanly.
- error: patch failed: tests/python/pants_test/base/test_payload_field.py:2
- Falling back to three-way merge...
- Applied patch to 'tests/python/pants_test/base/test_payload_field.py' cleanly.
- U src/python/pants/backend/jvm/register.py
- warning: 1 line adds whitespace errors.
- The patch was partially applied, but there were conflicts in:
- src/python/pants/backend/jvm/register.py
- mateor@mateor-HP-m6:~/development/new_pants/pants$ git log -1
- commit 64a8085e2fa415f60c944f437252a50efd1c9b36
- Author: David Turner <dturner@twopensource.com>
- Date: Thu Feb 5 20:38:31 2015 -0800
- Move with_artifacts to an artifacts argument (BUILD file format cleanup).
- As we discussed at the summit, I would like to move to an
- easier-to-parse BUILD file format; this change begins that process.
- Testing Done:
- https://travis-ci.org/pantsbuild/pants/builds/49697153
- Reviewed at https://rbcommons.com/s/twitter/r/1672/
- Snippet from jvm.register:
- from pants.backend.jvm.targets.exclude import Exclude
- <<<<<<< ours
- from pants.backend.jvm.targets.unpacked_jars import UnpackedJars
- =======
- >>>>>>> theirs
- from pants.backend.jvm.targets.jar_dependency import IvyArtifact, JarDependency
- from pants.backend.jvm.targets.jar_library import JarLibrary
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement