Google Git
Sign in
apache / subversion / d1a9dbdcc3038a85c7a36fe843609f9ccc748f0f
commitd1a9dbdcc3038a85c7a36fe843609f9ccc748f0f[log] [tgz]
authorPaul Burba <pburba@apache.org>Mon Jul 14 16:49:29 2008 +0000
committerPaul Burba <pburba@apache.org>Mon Jul 14 16:49:29 2008 +0000
treed8683fbe264a74bc93db261eb4476c649e70ce8b
parent8d033c70d7931e25947151c117aa675128cbf306 [diff]
On the src-branch-3157 backport branch, merge r31151 and r31391 from trunk.

* subversion/libsvn_client/merge.c
* subversion/tests/cmdline/merge_tests.py
  Clean merge.

* src-branch-3157, COMMITTERS, subversion/bindings/swig:
  Mergeinfo updates.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-issue3157@872167 13f79535-47bb-0310-9956-ffa450edef68
2 files changed
tree: d8683fbe264a74bc93db261eb4476c649e70ce8b
  1. build/
  2. contrib/
  3. doc/
  4. notes/
  5. packages/
  6. subversion/
  7. tools/
  8. www/
  9. aclocal.m4
  10. autogen.sh
  11. BUGS
  12. build.conf
  13. CHANGES
  14. COMMITTERS
  15. configure.ac
  16. COPYING
  17. gen-make.py
  18. HACKING
  19. INSTALL
  20. Makefile.in
  21. README
  22. STATUS
  23. TRANSLATING
  24. win-tests.py