I added a new option to the command structure and the compile error I
get is this:
../../subversion/libsvn_client/.libs/libsvn_client-1.so: undefined
reference to `svn_wc__get_wcroot'
../../subversion/libsvn_client/.libs/libsvn_client-1.so: undefined
reference to `svn_wc_add_from_disk2'
What is going on here? This is totally unexpected! I grepped for the
terms and I cannot even see a connection %-)
I attached a patch of the changes I made and the compile log is at the
bottom of this mail.
I did make clean prior to this, and also make -k, the make here
was just to cut down the spammy list.
thanks for any advice!
-*- mode: compilation; default-directory: "/home/g/trunk/" -*-
Compilation started at Wed Jan 9 15:13:24
make
------ making all in apr
make[1]: Entering directory `/home/g/trunk/apr'
make[2]: Entering directory `/home/g/trunk/apr'
make[2]: Nothing to be done for `local-all'.
make[2]: Leaving directory `/home/g/trunk/apr'
make[1]: Leaving directory `/home/g/trunk/apr'
------ completed all in apr
------ making all in apr-util
make[1]: Entering directory `/home/g/trunk/apr-util'
make[2]: Entering directory `/home/g/trunk/apr-util'
make[2]: Nothing to be done for `local-all'.
make[2]: Leaving directory `/home/g/trunk/apr-util'
make[1]: Leaving directory `/home/g/trunk/apr-util'
------ completed all in apr-util
cd subversion/svnmucc && /bin/bash /home/g/trunk/libtool --tag=CC
--silent --mode=link gcc -g3 -fno-omit-frame-pointer -fno-inline -Wall
-Wmiss\
ing-prototypes -Wstrict-prototypes -Wmissing-declarations -pthread
-DSVN_DEBUG -DAP_DEBUG -rpath /usr/local/lib -o svnmucc svnmucc.lo ../.\
./subversion/libsvn_client/libsvn_client-1.la
../../subversion/libsvn_ra/libsvn_ra-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la ../../subv\
ersion/libsvn_delta/libsvn_delta-1.la -L/home/g/trunk/apr-util
-laprutil-1 -L/home/g/trunk/apr -lapr-1
../../subversion/libsvn_client/.libs/libsvn_client-1.so: undefined
reference to `svn_wc__get_wcroot'
../../subversion/libsvn_client/.libs/libsvn_client-1.so: undefined
reference to `svn_wc_add_from_disk2'
collect2: ld returned 1 exit status
make: *** [subversion/svnmucc/svnmucc] Error 1
Compilation exited abnormally with code 2 at Wed Jan 9 15:13:26
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 1429564)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -583,6 +583,9 @@ struct diff_cmd_baton {
relative to for output generation (see issue #2723). */
const char *relative_to_dir;
+ /* GGTODO: Comment needed */
+ svn_boolean_t ignore_extensions;
+
/* Whether property differences are ignored. */
svn_boolean_t ignore_properties;
Index: subversion/libsvn_diff/diff_file.c
===================================================================
--- subversion/libsvn_diff/diff_file.c (revision 1429564)
+++ subversion/libsvn_diff/diff_file.c (working copy)
@@ -1172,7 +1172,7 @@ static const apr_getopt_option_t diff_options[] =
{ "ignore-all-space", 'w', 0, NULL },
{ "ignore-eol-style", SVN_DIFF__OPT_IGNORE_EOL_STYLE, 0, NULL },
{ "show-c-function", 'p', 0, NULL },
- /* ### For compatibility; we don't support the argument to -u, because
+ /* ### Forcd compatibility; we don't support the argument to -u, because
* ### we don't have optional argument support. */
{ "unified", 'u', 0, NULL },
{ NULL, 0, 0, NULL }
Index: subversion/svn/cl.h
===================================================================
--- subversion/svn/cl.h (revision 1429564)
+++ subversion/svn/cl.h (working copy)
@@ -191,6 +191,7 @@ typedef struct svn_cl__opt_state_t
svn_boolean_t notice_ancestry; /* notice ancestry for diff-y operations */
svn_boolean_t summarize; /* create a summary of a diff */
svn_boolean_t use_git_diff_format; /* Use git's extended diff format */
+ svn_boolean_t ignore_extensions; /* ignore extention switches */
svn_boolean_t ignore_properties; /* ignore properties */
svn_boolean_t properties_only; /* Show properties only */
svn_boolean_t patch_compatible; /* Output compatible with GNU patch */
Index: subversion/svn/svn.c
===================================================================
--- subversion/svn/svn.c (revision 1429564)
+++ subversion/svn/svn.c (working copy)
@@ -80,6 +80,7 @@ typedef enum svn_cl__longopt_t {
opt_notice_ancestry,
opt_summarize,
opt_use_git_diff_format,
+ opt_ignore_extensions,
opt_ignore_properties,
opt_properties_only,
opt_patch_compatible,
@@ -185,6 +186,7 @@ const apr_getopt_option_t svn_cl__options[] =
{"show-updates", 'u', 0, N_("display update information")},
{"username", opt_auth_username, 1, N_("specify a username ARG")},
{"password", opt_auth_password, 1, N_("specify a password ARG")},
+
{"extensions", 'x', 1,
N_("Specify differencing options for external diff or\n"
" "
@@ -346,6 +348,9 @@ const apr_getopt_option_t svn_cl__options[] =
{"summarize", opt_summarize, 0, N_("show a summary of the results")},
{"git", opt_use_git_diff_format, 0,
N_("use git's extended diff format")},
+ {"ignore-extensions", opt_ignore_extensions, 0,
+ N_("call external diff program without '-u' or any"
+ "other switch")},
{"ignore-properties", opt_ignore_properties, 0,
N_("ignore properties during the operation")},
{"properties-only", opt_properties_only, 0,
@@ -557,8 +562,8 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table
"\n"
" Use just 'svn diff' to display local modifications in a working copy.\n"),
{'r', 'c', opt_old_cmd, opt_new_cmd, 'N', opt_depth, opt_diff_cmd,
- opt_internal_diff, 'x', opt_no_diff_deleted, opt_ignore_properties,
- opt_properties_only,
+ opt_internal_diff, 'x', opt_no_diff_deleted, opt_ignore_extensions,
+ opt_ignore_properties, opt_properties_only,
opt_show_copies_as_adds, opt_notice_ancestry, opt_summarize, opt_changelist,
opt_force, opt_xml, opt_use_git_diff_format, opt_patch_compatible} },
{ "export", svn_cl__export, {0}, N_
@@ -2001,6 +2006,9 @@ sub_main(int argc, const char *argv[], apr_pool_t
case opt_no_diff_deleted:
opt_state.diff.no_diff_deleted = TRUE;
break;
+ case opt_ignore_extensions:
+ opt_state.diff.ignore_extensions = TRUE;
+ break;
case opt_ignore_properties:
opt_state.diff.ignore_properties = TRUE;
break;
