Advertisement
mateorod

merge_1723.diff

Feb 6th, 2015
252
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.83 KB | None | 0 0
  1. mateor@mateor-HP-m6:~/development/new_pants/pants$ ./rbt patch --diff-revision 5 1723
  2. Patch is being applied from request 1723 with diff revision 5.
  3.  
  4. /tmp/tmpS_W30X:127: new blank line at EOF.
  5. +
  6. error: patch failed: src/python/pants/backend/jvm/register.py:12
  7. Falling back to three-way merge...
  8. Applied patch to 'src/python/pants/backend/jvm/register.py' with conflicts.
  9. error: patch failed: src/python/pants/backend/jvm/targets/jar_dependency.py:2
  10. Falling back to three-way merge...
  11. Applied patch to 'src/python/pants/backend/jvm/targets/jar_dependency.py' cleanly.
  12. error: patch failed: tests/python/pants_test/base/test_payload_field.py:2
  13. Falling back to three-way merge...
  14. Applied patch to 'tests/python/pants_test/base/test_payload_field.py' cleanly.
  15. U src/python/pants/backend/jvm/register.py
  16. warning: 1 line adds whitespace errors.
  17.  
  18. The patch was partially applied, but there were conflicts in:
  19.  
  20.     src/python/pants/backend/jvm/register.py
  21.  
  22. mateor@mateor-HP-m6:~/development/new_pants/pants$ git log -1
  23. commit 64a8085e2fa415f60c944f437252a50efd1c9b36
  24. Author: David Turner <dturner@twopensource.com>
  25. Date:   Thu Feb 5 20:38:31 2015 -0800
  26.  
  27.     Move with_artifacts to an artifacts argument (BUILD file format cleanup).
  28.    
  29.     As we discussed at the summit, I would like to move to an
  30.     easier-to-parse BUILD file format; this change begins that process.
  31.    
  32.     Testing Done:
  33.     https://travis-ci.org/pantsbuild/pants/builds/49697153
  34.    
  35.     Reviewed at https://rbcommons.com/s/twitter/r/1672/
  36.  
  37. Snippet from jvm.register:
  38.  
  39. from pants.backend.jvm.targets.exclude import Exclude
  40. <<<<<<< ours
  41. from pants.backend.jvm.targets.unpacked_jars import UnpackedJars
  42. =======
  43. >>>>>>> theirs
  44. from pants.backend.jvm.targets.jar_dependency import IvyArtifact, JarDependency
  45. from pants.backend.jvm.targets.jar_library import JarLibrary
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement