Google Git
Sign in
apache / subversion / refs/heads/integrate-cache-item-serialization
commit9534fd8b4a693bfc56ccfd7cf20c3f9030e205ab[log] [tgz]
authorStefan Fuhrmann <stefan2@apache.org>Wed Feb 09 02:04:07 2011 +0000
committerStefan Fuhrmann <stefan2@apache.org>Wed Feb 09 02:04:07 2011 +0000
tree896ad6af2be1748d0cf6a1982ace0f54a1ba0d2c
parentbbe91346813eeb7646ae95c24bcb9b84e9874d12 [diff]
Well, the cherry-picking merge with lots of tree conflicts did not really work well.
Fix all the artifacts.

* subversion/libsvn_fs_fs/temp_serializer.c,
  subversion/libsvn_fs_fs/temp_serializer.h: add missing files
* subversion/libsvn_fs_fs/caching.c,
  subversion/libsvn_fs_fs/id.c
  subversion/libsvn_fs_fs/svn_temp_serializer.c: fix the conflict resolution

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/integrate-cache-item-serialization@1068739 13f79535-47bb-0310-9956-ffa450edef68
5 files changed
tree: 896ad6af2be1748d0cf6a1982ace0f54a1ba0d2c
  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. win-tests.py