Checkout
Greg Stein
committed
on 17 Feb 09
More merging from the explore-wc branch to trunk.

Revisions merged, and primary (desired) change:
35412: start generating wc-metadata.sql.… Show more
More merging from the explore-wc branch to trunk.

Revisions merged, and primary (desired) change:

35412: start generating wc-metadata.sql.h

35708: look for wc.db when checking the wc format

35721: be consistent and use wc-metadata.h

35722: move version detection into wc_db

35762: update svn:ignore on libsvn_wc

35861: correct CLEAN_FILES handling in Makefile.in

After handling a few conflicts, post-merge, I needed to #ifdef out some of

the new sqlite code in entries.c, and tweak svn_wc__db_version().

* subversion/libsvn_wc/entries.c:

 (...): plain old merge

 (svn_wc__entries_write_old, svn_wc__entries_init): add some #ifdef

   guards around the new sqlite code.

* subversion/libsvn_wc/wc_db.c:

 (...): plain old merge

 (svn_wc__db_version): check for APR_ENOENT from the db version test

Show less