Google Git
Sign in
apache/subversion/refs/heads/1.7.x-JavaHL-pools
commit
a78cc29ab3ee1522acc757019a8f96c7e7086642
[log]
author
Bert Huijben <rhuijben@apache.org>
Wed Aug 17 13:42:11 2011 +0000
committer
Bert Huijben <rhuijben@apache.org>
Wed Aug 17 13:42:11 2011 +0000
tree
3125f812112cd7e16b136c29cd21d5519e887cd2
parent
a17e647473d7e825a967e68bb4b13d79374e4632 [diff]
On the 1.7.x-JavaHL-pools branch: Properly resolve the merge conflict that
made me create a branch.

Found by: markphip

* subversion/bindings/javahl/native/SVNClient.cpp
  (propertySetRemote): Provide the log message instead of NULL.  

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-JavaHL-pools@1158696 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
tree: 3125f812112cd7e16b136c29cd21d5519e887cd2
  1. build/
  2. contrib/
  3. doc/
  4. notes/
  5. packages/
  6. subversion/
  7. tools/
  8. aclocal.m4
  9. autogen.sh
  10. BUGS
  11. build.conf
  12. CHANGES
  13. COMMITTERS
  14. configure.ac
  15. gen-make.py
  16. get-deps.sh
  17. INSTALL
  18. LICENSE
  19. Makefile.in
  20. NOTICE
  21. README
  22. STATUS
  23. win-tests.py