diff -ru subversion.orig/subversion/include/svn_error.h subversion/subversion/include/svn_error.h
--- subversion.orig/subversion/include/svn_error.h	Tue Sep 19 16:07:35 2000
+++ subversion/subversion/include/svn_error.h	Tue Sep 19 22:25:57 2000
@@ -99,6 +99,9 @@
   /* Trying to unlock when there's non-empty unwind stack. */
   SVN_ERR_WC_UNWIND_NOT_EMPTY,
 
+  /* ??? need comment ??? */
+  SVN_ERR_WC_BAD_ADM_LOG,
+
   /* A general filesystem error.  */
   SVN_ERR_FS_GENERAL,
 
diff -ru subversion.orig/subversion/include/svn_fs.h subversion/subversion/include/svn_fs.h
--- subversion.orig/subversion/include/svn_fs.h	Tue Sep 19 12:14:43 2000
+++ subversion/subversion/include/svn_fs.h	Tue Sep 19 21:44:33 2000
@@ -79,7 +79,7 @@
 
 
 /* An object representing a Subversion filesystem.  */
-typedef struct svn_fs_t svn_fs_t;
+typedef struct svn_fs svn_fs_t;
 
 
 /* Create a new filesystem object in POOL.  It doesn't refer to any
diff -ru subversion.orig/subversion/libsvn_fs/delta.c subversion/subversion/libsvn_fs/delta.c
--- subversion.orig/subversion/libsvn_fs/delta.c	Tue Sep 19 16:00:51 2000
+++ subversion/subversion/libsvn_fs/delta.c	Tue Sep 19 22:26:15 2000
@@ -136,7 +136,7 @@
 
   source_path.len = 0;
 
-  svn_err = editor->replace_root (edit_baton, &root_baton);
+  svn_err = editor->replace_root (NULL/*??? what should these be ???*/, NULL/*???*/, edit_baton, &root_baton);
   if (svn_err) goto error;
 
   c.editor = editor;
@@ -573,7 +573,7 @@
      svn_fs_dir_t *source, svn_string_t *source_path,
      svn_fs_dir_t *target, svn_string_t *name)
 {
-  ...;
+  /*...;*/
 }
 
 
@@ -815,5 +815,5 @@
 		  void *dir_baton,
 		  svn_fs_dir_t *target)
 {
-  ...;
+  /*...;*/
 }
diff -ru subversion.orig/subversion/libsvn_ra_dav/tests/Makefile.am subversion/subversion/libsvn_ra_dav/tests/Makefile.am
--- subversion.orig/subversion/libsvn_ra_dav/tests/Makefile.am	Tue Sep 19 16:00:53 2000
+++ subversion/subversion/libsvn_ra_dav/tests/Makefile.am	Tue Sep 19 21:38:19 2000
@@ -10,8 +10,8 @@
 ## Libraries this binary depends upon:
 ra_dav_test_LDADD = ../libsvn_ra_dav.la                     \
                     ../../libsvn_string/libsvn_string.la    \
-                    ../../libsvn_subr/libsvn_subr.la        \
                     ../../libsvn_wc/libsvn_wc.la            \
+                    ../../libsvn_subr/libsvn_subr.la        \
                     ../../libsvn_delta/libsvn_delta.la      \
                     ../../../expat-lite/libexpat.la         \
                     ../../../neon/libneon.la                \
diff -ru subversion.orig/subversion/mod_dav_svn/Makefile.am subversion/subversion/mod_dav_svn/Makefile.am
--- subversion.orig/subversion/mod_dav_svn/Makefile.am	Mon Sep 11 02:21:52 2000
+++ subversion/subversion/mod_dav_svn/Makefile.am	Tue Sep 19 21:50:38 2000
@@ -10,7 +10,7 @@
 libmod_dav_svn_la_SOURCES = mod_dav_svn.c deadprops.c liveprops.c repos.c \
 				version.c
 
-INCLUDES = -I../include $(APACHE_INCLUDES)
+INCLUDES = -I../include @APACHE_INCLUDES@
 
 SUBDIRS = . tests