diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-03-18 13:33:26 +0000 |
|---|---|---|
| committer | <> | 2015-07-08 14:41:01 +0000 |
| commit | bb0ef45f7c46b0ae221b26265ef98a768c33f820 (patch) | |
| tree | 98bae10dde41c746c51ae97ec4f879e330415aa7 /subversion/svn/commit-cmd.c | |
| parent | 239dfafe71711b2f4c43d7b90a1228d7bdc5195e (diff) | |
| download | subversion-tarball-bb0ef45f7c46b0ae221b26265ef98a768c33f820.tar.gz | |
Imported from /home/lorry/working-area/delta_subversion-tarball/subversion-1.8.13.tar.gz.subversion-1.8.13
Diffstat (limited to 'subversion/svn/commit-cmd.c')
| -rw-r--r-- | subversion/svn/commit-cmd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/subversion/svn/commit-cmd.c b/subversion/svn/commit-cmd.c index e227f04..2d04c69 100644 --- a/subversion/svn/commit-cmd.c +++ b/subversion/svn/commit-cmd.c @@ -29,6 +29,7 @@ #include <apr_general.h> +#include "svn_hash.h" #include "svn_error.h" #include "svn_error_codes.h" #include "svn_wc.h" @@ -136,8 +137,7 @@ svn_cl__commit(apr_getopt_t *os, if (opt_state->depth == svn_depth_unknown) opt_state->depth = svn_depth_infinity; - cfg = apr_hash_get(ctx->config, SVN_CONFIG_CATEGORY_CONFIG, - APR_HASH_KEY_STRING); + cfg = svn_hash_gets(ctx->config, SVN_CONFIG_CATEGORY_CONFIG); if (cfg) SVN_ERR(svn_config_get_bool(cfg, &no_unlock, SVN_CONFIG_SECTION_MISCELLANY, @@ -166,11 +166,13 @@ svn_cl__commit(apr_getopt_t *os, } /* Commit. */ - err = svn_client_commit5(targets, + err = svn_client_commit6(targets, opt_state->depth, no_unlock, opt_state->keep_changelists, TRUE /* commit_as_operations */, + opt_state->include_externals, /* file externals */ + opt_state->include_externals, /* dir externals */ opt_state->changelists, opt_state->revprop_table, (opt_state->quiet |