[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] misc svn build errors

From: Karl Fogel <kfogel_at_galois.collab.net>
Date: 2000-09-20 18:05:40 CEST

Bob Miller <kbob@jogger-egg.com> writes:
> (Is this the right format for a log message?)
>
> LOG MESSAGE
>
> (SVN_ERR_WC_BAD_ADM_LOG) is now defined in svn_error.h.
> (svn_fs): is now correctly typedef'd to svn_fs_t.
> (svn_fs_dir_delta): fixed args in call to editor->replace_root.
> libsvn_delta/delta.c(add, dir_from_scratch): fixed syntax errors.
> libsvn_ra_dav/tests/Makefile.am: reordered library dependencies.
> mod_dav_svn/Makefile.am: fixed APACHE_INCLUDES.

Close -- generally, symbol names in parentheses are followed by a
colon, and filenames are preceded by an asterisk in the left margin,
thus:

(SVN_ERR_WC_BAD_ADM_LOG): new #define.
(svn_fs): typedef to svn_fs_t.
(svn_fs_dir_delta): fixed args in call to editor->replace_root.
* libsvn_delta/delta.c (add, dir_from_scratch): fixed syntax errors.
* libsvn_ra_dav/tests/Makefile.am: reordered library dependencies.
* mod_dav_svn/Makefile.am: fixed APACHE_INCLUDES.

By the way, the deal with replace_root() is that we're thinking of
omitting its ancestry arguments (the first two args). We're pretty
sure they're not needed and are not appropriate for the root of the
change -- however, as I was making the change, I had second thoughts,
and so haven't committed it yet. Meanwhile, Jim had assumed the
change when we was writing the call editor->replace_root.

I'm just sleeping on that change; if I get comfortable with it again,
and no one else has a problem with it, then I'll do it for real.

So patching the call to editor->replace_root to pass those two args is
a good thing, but note that *all* such calls may soon change to be
like Jim's original call -- the first two args would go away.

I don't know what was up with the syntax issues in delta.c. I could
swear I made clean and built it successfully before committing, but I
must have goofed somewhere. "Cosmic rays"... :-)

-Karl

> kbob_at_jogger-egg.com, http://www.jogger-egg.com/
>
> --envbJBWh7q8WU6mo
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: attachment; filename=patch
>
> 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
>
>
> --envbJBWh7q8WU6mo--
Received on Sat Oct 21 14:36:08 2006

This is an archived mail posted to the Subversion Dev mailing list.