Author: hwright
Date: Tue Jan 8 23:46:00 2013
New Revision: 1430634
URL: http://svn.apache.org/viewvc?rev=1430634&view=rev
Log:
On the ev2-export branch:
Bring up-to-date with trunk. This introduces build breakage as a result of
r1430386 on trunk.
Added:
subversion/branches/ev2-export/subversion/include/private/svn_editor.h
- copied unchanged from r1430567,
subversion/trunk/subversion/include/private/svn_editor.h
subversion/branches/ev2-export/subversion/libsvn_client/diff_local.c
- copied unchanged from r1430567,
subversion/trunk/subversion/libsvn_client/diff_local.c
subversion/branches/ev2-export/subversion/libsvn_wc/wcroot_anchor.c
- copied unchanged from r1430567,
subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c
subversion/branches/ev2-export/tools/hook-scripts/validate-files.conf.example
- copied unchanged from r1430567,
subversion/trunk/tools/hook-scripts/validate-files.conf.example
subversion/branches/ev2-export/tools/hook-scripts/validate-files.py
- copied unchanged from r1430567,
subversion/trunk/tools/hook-scripts/validate-files.py
subversion/branches/ev2-export/tools/server-side/svnauthz.c
- copied unchanged from r1430567,
subversion/trunk/tools/server-side/svnauthz.c
Removed:
subversion/branches/ev2-export/subversion/include/svn_editor.h
subversion/branches/ev2-export/tools/server-side/svnauthz-validate.c
Modified:
subversion/branches/ev2-export/ (props changed)
subversion/branches/ev2-export/Makefile.in
subversion/branches/ev2-export/autogen.sh
subversion/branches/ev2-export/build.conf
subversion/branches/ev2-export/build/win32/make_dist.py
subversion/branches/ev2-export/doc/doxygen.conf
subversion/branches/ev2-export/get-deps.sh
subversion/branches/ev2-export/subversion/bindings/cxxhl/src/exception.cpp
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/ev2-export/subversion/include/private/svn_client_private.h
subversion/branches/ev2-export/subversion/include/private/svn_fs_private.h
subversion/branches/ev2-export/subversion/include/private/svn_subr_private.h
subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
subversion/branches/ev2-export/subversion/include/svn_client.h
subversion/branches/ev2-export/subversion/include/svn_dav.h
subversion/branches/ev2-export/subversion/include/svn_delta.h
subversion/branches/ev2-export/subversion/include/svn_fs.h
subversion/branches/ev2-export/subversion/include/svn_repos.h
subversion/branches/ev2-export/subversion/include/svn_wc.h
subversion/branches/ev2-export/subversion/libsvn_client/client.h
subversion/branches/ev2-export/subversion/libsvn_client/commit.c
subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
subversion/branches/ev2-export/subversion/libsvn_client/copy.c
subversion/branches/ev2-export/subversion/libsvn_client/delete.c
subversion/branches/ev2-export/subversion/libsvn_client/deprecated.c
subversion/branches/ev2-export/subversion/libsvn_client/diff.c
subversion/branches/ev2-export/subversion/libsvn_client/diff_summarize.c
subversion/branches/ev2-export/subversion/libsvn_client/externals.c
subversion/branches/ev2-export/subversion/libsvn_client/info.c
subversion/branches/ev2-export/subversion/libsvn_client/merge.c
subversion/branches/ev2-export/subversion/libsvn_client/repos_diff.c
subversion/branches/ev2-export/subversion/libsvn_client/status.c
subversion/branches/ev2-export/subversion/libsvn_delta/editor.c
subversion/branches/ev2-export/subversion/libsvn_diff/diff_file.c
subversion/branches/ev2-export/subversion/libsvn_fs/editor.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/tree.c
subversion/branches/ev2-export/subversion/libsvn_ra/deprecated.h
subversion/branches/ev2-export/subversion/libsvn_ra/editor.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/options.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/ev2-export/subversion/libsvn_ra_svn/editorp.c
subversion/branches/ev2-export/subversion/libsvn_repos/authz.c
subversion/branches/ev2-export/subversion/libsvn_repos/commit.c
subversion/branches/ev2-export/subversion/libsvn_subr/properties.c
subversion/branches/ev2-export/subversion/libsvn_subr/sqlite.c
subversion/branches/ev2-export/subversion/libsvn_subr/version.c
subversion/branches/ev2-export/subversion/libsvn_wc/adm_ops.c
subversion/branches/ev2-export/subversion/libsvn_wc/conflicts.c
subversion/branches/ev2-export/subversion/libsvn_wc/conflicts.h
subversion/branches/ev2-export/subversion/libsvn_wc/copy.c
subversion/branches/ev2-export/subversion/libsvn_wc/diff_editor.c
subversion/branches/ev2-export/subversion/libsvn_wc/diff_local.c
subversion/branches/ev2-export/subversion/libsvn_wc/externals.c
subversion/branches/ev2-export/subversion/libsvn_wc/merge.c
subversion/branches/ev2-export/subversion/libsvn_wc/props.c
subversion/branches/ev2-export/subversion/libsvn_wc/props.h
subversion/branches/ev2-export/subversion/libsvn_wc/status.c
subversion/branches/ev2-export/subversion/libsvn_wc/translate.c
subversion/branches/ev2-export/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/ev2-export/subversion/libsvn_wc/update_editor.c
subversion/branches/ev2-export/subversion/libsvn_wc/upgrade.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc-queries.sql
subversion/branches/ev2-export/subversion/libsvn_wc/wc.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_private.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/ev2-export/subversion/libsvn_wc/workqueue.c
subversion/branches/ev2-export/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/ev2-export/subversion/mod_dav_svn/authz.c
subversion/branches/ev2-export/subversion/mod_dav_svn/version.c
subversion/branches/ev2-export/subversion/svn/diff-cmd.c
subversion/branches/ev2-export/subversion/svn/log-cmd.c
subversion/branches/ev2-export/subversion/svn/move-cmd.c
subversion/branches/ev2-export/subversion/svn/status.c
subversion/branches/ev2-export/subversion/svn/svn.c
subversion/branches/ev2-export/subversion/svn/switch-cmd.c
subversion/branches/ev2-export/subversion/svn/tree-conflicts.c
subversion/branches/ev2-export/subversion/svnrdump/dump_editor.c
subversion/branches/ev2-export/subversion/svnrdump/svnrdump.h
subversion/branches/ev2-export/subversion/svnserve/serve.c
subversion/branches/ev2-export/subversion/tests/cmdline/changelist_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/diff_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/export_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/info_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/patch_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/stat_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svntest/wc.py
subversion/branches/ev2-export/subversion/tests/cmdline/switch_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/update_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/wc_tests.py
subversion/branches/ev2-export/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.h
subversion/branches/ev2-export/tools/client-side/svn-bench/svn-bench.c
subversion/branches/ev2-export/tools/dev/fsfs-access-map.c
subversion/branches/ev2-export/tools/dist/release.py
subversion/branches/ev2-export/tools/server-side/svnpubsub/svnwcsub.py
Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jan 8 23:46:00 2013
@@ -49,5 +49,6 @@ mkmf.log
zlib
sqlite-amalgamation
serf
+gtest
.git
.gitignore
Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1427238-1430567
Modified: subversion/branches/ev2-export/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/Makefile.in?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/Makefile.in (original)
+++ subversion/branches/ev2-export/Makefile.in Tue Jan 8 23:46:00 2013
@@ -926,4 +926,5 @@ INSTALL_EXTRA_TOOLS=\
$(MKDIR) $(DESTDIR)$(bindir); \
test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
- ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT)
$(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
+ ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT)
$(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
+ ln -sf svnauthz$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
Modified: subversion/branches/ev2-export/autogen.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/autogen.sh?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/autogen.sh (original)
+++ subversion/branches/ev2-export/autogen.sh Tue Jan 8 23:46:00 2013
@@ -202,6 +202,7 @@ echo ""
echo "./configure --enable-maintainer-mode"
echo "./configure --disable-shared"
echo "./configure --enable-maintainer-mode --disable-shared"
+echo "./configure --disable-optimize --enable-debug"
echo "./configure CUSERFLAGS='--flags-for-C' CXXUSERFLAGS='--flags-for-C++'"
echo ""
echo "Note: If you wish to run a Subversion HTTP server, you will need"
Modified: subversion/branches/ev2-export/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/build.conf?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/build.conf (original)
+++ subversion/branches/ev2-export/build.conf Tue Jan 8 23:46:00 2013
@@ -221,7 +221,7 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_delta
libs = libsvn_subr aprutil apriconv apr zlib
-msvc-export = svn_delta.h svn_editor.h private/svn_delta_private.h
+msvc-export = svn_delta.h private/svn_editor.h private/svn_delta_private.h
# Routines for diffing
[libsvn_diff]
@@ -1204,7 +1204,7 @@ path = build/win32
libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync
svnversion
mod_authz_svn mod_dav_svn mod_dontdothat
- svnauthz-validate svnraisetreeconflict
+ svnauthz svnraisetreeconflict
[__ALL_TESTS__]
type = project
@@ -1322,11 +1322,11 @@ install = tools
libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr libsvn_delta
apriconv apr
-[svnauthz-validate]
-description = Authz config file validator
+[svnauthz]
+description = Authz config file tool
type = exe
path = tools/server-side
-sources = svnauthz-validate.c
+sources = svnauthz.c
install = tools
libs = libsvn_repos libsvn_fs libsvn_subr apr
Modified: subversion/branches/ev2-export/build/win32/make_dist.py
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/win32/make_dist.py?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/win32/make_dist.py (original)
+++ subversion/branches/ev2-export/build/win32/make_dist.py Tue Jan 8 23:46:00
2013
@@ -215,8 +215,8 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(blddir)s/svnmucc/svnmucc.pdb'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'),
-
File('%(blddir)s/../tools/server-side/svnauthz-validate.exe'),
-
File('%(blddir)s/../tools/server-side/svnauthz-validate.pdb'),
+ File('%(blddir)s/../tools/server-side/svnauthz.exe'),
+ File('%(blddir)s/../tools/server-side/svnauthz.pdb'),
File('%(blddir)s/../tools/server-side/svn-populate-node-origins-index.exe'),
File('%(blddir)s/../tools/server-side/svn-populate-node-origins-index.pdb'),
File('%(blddir)s/../tools/dev/svnraisetreeconflict/svnraisetreeconflict.exe'),
Modified: subversion/branches/ev2-export/doc/doxygen.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/doc/doxygen.conf?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/doc/doxygen.conf (original)
+++ subversion/branches/ev2-export/doc/doxygen.conf Tue Jan 8 23:46:00 2013
@@ -754,7 +754,7 @@ COLS_IN_ALPHA_INDEX = 5
# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX =
+IGNORE_PREFIX = svn_ SVN_
#---------------------------------------------------------------------------
# configuration options related to the HTML output
Modified: subversion/branches/ev2-export/get-deps.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/get-deps.sh?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/get-deps.sh (original)
+++ subversion/branches/ev2-export/get-deps.sh Tue Jan 8 23:46:00 2013
@@ -29,6 +29,9 @@ SERF=serf-1.1.1
ZLIB=zlib-1.2.7
SQLITE_VERSION=3.7.15.1
SQLITE=sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo $SQLITE_VERSION |
sed -e 's/\./ /g'))
+GTEST_VERSION=1.6.0
+GTEST=gtest-${GTEST_VERSION}
+GTEST_URL=http://googletest.googlecode.com/files/
HTTPD=httpd-2.4.3
APR_ICONV=apr-iconv-1.2.1
@@ -48,7 +51,7 @@ APACHE_MIRROR=http://archive.apache.org/
# helpers
usage() {
echo "Usage: $0"
- echo "Usage: $0 [ apr | serf | zlib | sqlite ] ..."
+ echo "Usage: $0 [ apr | serf | zlib | sqlite | gtest ] ..."
exit $1
}
@@ -103,11 +106,23 @@ get_sqlite() {
}
+get_gtest() {
+ test -d $BASEDIR/gtest && return
+
+ cd $TEMPDIR
+ $HTTP_FETCH ${GTEST_URL}/${GTEST}.zip
+ cd $BASEDIR
+
+ unzip -q $TEMPDIR/$GTEST.zip
+
+ mv $GTEST gtest
+}
+
# main()
get_deps() {
mkdir -p $TEMPDIR
- for i in zlib serf sqlite-amalgamation apr apr-util; do
+ for i in zlib serf sqlite-amalgamation apr apr-util gtest; do
if [ -d $i ]; then
echo "Local directory '$i' already exists; the downloaded copy won't
be used" >&2
fi
Modified:
subversion/branches/ev2-export/subversion/bindings/cxxhl/src/exception.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/cxxhl/src/exception.cpp?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/cxxhl/src/exception.cpp
(original)
+++ subversion/branches/ev2-export/subversion/bindings/cxxhl/src/exception.cpp
Tue Jan 8 23:46:00 2013
@@ -309,11 +309,11 @@ error::message_list error::compile_messa
}
catch (...)
{
- svn_pool_destroy(pool);
+ apr_pool_destroy(pool);
throw;
}
- svn_pool_destroy(pool);
+ apr_pool_destroy(pool);
return ml;
}
Modified:
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_wc.rb
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_wc.rb?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
---
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_wc.rb
(original)
+++
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_wc.rb
Tue Jan 8 23:46:00 2013
@@ -650,10 +650,10 @@ EOE
ctx.add(path)
ctx.ci(path)
- File.open(path, "w") {|f| f.print("b")}
+ File.open(path, "w") {|f| f.print("bb")}
ctx.ci(path)
- File.open(path, "w") {|f| f.print("c")}
+ File.open(path, "w") {|f| f.print("ccc")}
rev = ctx.ci(path).revision
status = Svn::Wc::RevisionStatus.new(path, nil, true)
Modified:
subversion/branches/ev2-export/subversion/include/private/svn_client_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/private/svn_client_private.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
---
subversion/branches/ev2-export/subversion/include/private/svn_client_private.h
(original)
+++
subversion/branches/ev2-export/subversion/include/private/svn_client_private.h
Tue Jan 8 23:46:00 2013
@@ -226,6 +226,19 @@ svn_client__wc_node_get_origin(svn_clien
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* Produce a diff between two files or two directories at LOCAL_ABSPATH1
+ * and LOCAL_ABSPATH2, using the provided diff callbacks to show changes
+ * in files. The files and directories involved may be part of a working
+ * copy or they may be unversioned. For versioned files, show property
+ * changes, too. */
+svn_error_t *
+svn_client__arbitrary_nodes_diff(const char *local_abspath1,
+ const char *local_abspath2,
+ const svn_wc_diff_callbacks4_t *callbacks,
+ void *callback_baton,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *scratch_pool);
+
#ifdef __cplusplus
}
Modified:
subversion/branches/ev2-export/subversion/include/private/svn_fs_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/private/svn_fs_private.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/private/svn_fs_private.h
(original)
+++ subversion/branches/ev2-export/subversion/include/private/svn_fs_private.h
Tue Jan 8 23:46:00 2013
@@ -26,6 +26,7 @@
#define SVN_FS_PRIVATE_H
#include "svn_fs.h"
+#include "private/svn_editor.h"
#ifdef __cplusplus
extern "C" {
@@ -67,6 +68,120 @@ svn_fs__access_get_lock_tokens(svn_fs_ac
svn_error_t *
svn_fs__path_valid(const char *path, apr_pool_t *pool);
+
+
+/** Editors
+ *
+ * ### docco
+ *
+ * @defgroup svn_fs_editor Transaction editors
+ * @{
+ */
+
+/**
+ * Create a new filesystem transaction, based on based on the youngest
+ * revision of @a fs, and return its name @a *txn_name and an @a *editor
+ * that can be used to make changes into it.
+ *
+ * @a flags determines transaction enforcement behaviors, and is composed
+ * from the constants SVN_FS_TXN_* (#SVN_FS_TXN_CHECK_OOD etc.). It is a
+ * property of the underlying transaction, and will not change if multiple
+ * editors are used to refer to that transaction (see @a autocommit, below).
+ *
+ * @note If you're building a txn for committing, you probably don't want
+ * to call this directly. Instead, call svn_repos__get_commit_ev2(), which
+ * honors the repository's hook configurations.
+ *
+ * When svn_editor_complete() is called for @a editor, internal resources
+ * will be cleaned and nothing more will happen. If you wish to commit the
+ * transaction, call svn_fs_editor_commit() instead. It is illegal to call
+ * both; the second call will return #SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION.
+ *
+ * @see svn_fs_commit_txn()
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs__editor_create(svn_editor_t **editor,
+ const char **txn_name,
+ svn_fs_t *fs,
+ apr_uint32_t flags,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+
+/**
+ * Like svn_fs__editor_create(), but open an existing transaction
+ * @a txn_name and continue editing it.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs__editor_create_for(svn_editor_t **editor,
+ svn_fs_t *fs,
+ const char *txn_name,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+
+/**
+ * Commit the transaction represented by @a editor.
+ *
+ * If the commit to the filesystem succeeds, then @a *revision will be set
+ * to the resulting revision number. Note that further errors may occur,
+ * as described below. If the commit process does not succeed, for whatever
+ * reason, then @a *revision will be set to #SVN_INVALID_REVNUM.
+ *
+ * If a conflict occurs during the commit, then @a *conflict_path will
+ * be set to a path that caused the conflict. #SVN_NO_ERROR will be returned.
+ * Callers may want to construct an #SVN_ERR_FS_CONFLICT error with a
+ * message that incorporates @a *conflict_path.
+ *
+ * If a non-conflict error occurs during the commit, then that error will
+ * be returned.
+ * As is standard with any Subversion API, @a revision, @a post_commit_err,
+ * and @a conflict_path (the OUT parameters) have an indeterminate value if
+ * an error is returned.
+ *
+ * If the commit completes (and a revision is returned in @a *revision), then
+ * it is still possible for an error to occur during the cleanup process.
+ * Any such error will be returned in @a *post_commit_err. The caller must
+ * properly use or clear that error.
+ *
+ * If svn_editor_complete() has already been called on @a editor, then
+ * #SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION will be returned.
+ *
+ * @note After calling this function, @a editor will be marked as completed
+ * and no further operations may be performed on it. The underlying
+ * transaction will either be committed or aborted once this function is
+ * called. It cannot be recovered for additional work.
+ *
+ * @a result_pool will be used to allocate space for @a conflict_path.
+ * @a scratch_pool will be used for all temporary allocations.
+ *
+ * @note To summarize, there are three possible outcomes of this function:
+ * successful commit (with or without an associated @a *post_commit_err);
+ * failed commit due to a conflict (reported via @a *conflict_path); and
+ * failed commit for some other reason (reported via the returned error.)
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs__editor_commit(svn_revnum_t *revision,
+ svn_error_t **post_commit_err,
+ const char **conflict_path,
+ svn_editor_t *editor,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+
+/** @} */
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified:
subversion/branches/ev2-export/subversion/include/private/svn_subr_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/private/svn_subr_private.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
---
subversion/branches/ev2-export/subversion/include/private/svn_subr_private.h
(original)
+++
subversion/branches/ev2-export/subversion/include/private/svn_subr_private.h
Tue Jan 8 23:46:00 2013
@@ -295,6 +295,23 @@ svn_hash__make(apr_pool_t *pool);
/** @} */
+
+/** Apply the changes described by @a prop_changes to @a original_props and
+ * return the result. The inverse of svn_prop_diffs().
+ *
+ * Allocate the resulting hash from @a pool, but allocate its keys and
+ * values from @a pool and/or by reference to the storage of the inputs.
+ *
+ * Note: some other APIs use an array of pointers to svn_prop_t.
+ *
+ * @since New in 1.8.
+ */
+apr_hash_t *
+svn_prop__patch(const apr_hash_t *original_props,
+ const apr_array_header_t *prop_changes,
+ apr_pool_t *pool);
+
+
/**
* @defgroup svn_version Version number dotted triplet parsing
* @{
Modified:
subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
(original)
+++ subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
Tue Jan 8 23:46:00 2013
@@ -335,11 +335,11 @@ svn_wc__is_wcroot(svn_boolean_t *is_wcro
* working copy in which @a local_abspath resides.
*/
svn_error_t *
-svn_wc__get_wc_root(const char **wcroot_abspath,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_wc__get_wcroot(const char **wcroot_abspath,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/**
* The following are temporary APIs to aid in the transition from wc-1 to
Modified: subversion/branches/ev2-export/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/svn_client.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/svn_client.h (original)
+++ subversion/branches/ev2-export/subversion/include/svn_client.h Tue Jan 8
23:46:00 2013
@@ -4510,6 +4510,12 @@ svn_client_copy(svn_client_commit_info_t
* allowed. This parameter should be set to FALSE except where backwards
* compatibility to svn_client_move6() is required.
*
+ * If @a metadata_only is @c TRUE and moving a file in a working copy,
+ * everything in the metadata is updated as if the node is moved, but the
+ * actual disk move operation is not performed. This feature is useful for
+ * clients that want to keep the working copy in sync while the actual working
+ * copy is updated by some other task.
+ *
* If non-NULL, @a revprop_table is a hash table holding additional,
* custom revision properties (<tt>const char *</tt> names mapped to
* <tt>svn_string_t *</tt> values) to be set on the new revision in
@@ -4538,6 +4544,7 @@ svn_client_move7(const apr_array_header_
svn_boolean_t move_as_child,
svn_boolean_t make_parents,
svn_boolean_t allow_mixed_revisions,
+ svn_boolean_t metadata_only,
const apr_hash_t *revprop_table,
svn_commit_callback2_t commit_callback,
void *commit_baton,
@@ -4546,7 +4553,7 @@ svn_client_move7(const apr_array_header_
/**
* Similar to svn_client_move7(), but with allow_mixed_revisions always
- * set to @c TRUE.
+ * set to @c TRUE and record_only always to @c FALSE.
*
* @since New in 1.7.
* @deprecated Provided for backward compatibility with the 1.7 API.
Modified: subversion/branches/ev2-export/subversion/include/svn_dav.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/svn_dav.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/svn_dav.h (original)
+++ subversion/branches/ev2-export/subversion/include/svn_dav.h Tue Jan 8
23:46:00 2013
@@ -317,6 +317,13 @@ extern "C" {
#define SVN_DAV_NS_DAV_SVN_EPHEMERAL_TXNPROPS\
SVN_DAV_PROP_NS_DAV "svn/ephemeral-txnprops"
+/** Presence of this in a DAV header in an OPTIONS response indicates
+ * that the transmitter (in this case, the server) supports serving properties
+ * inline in update editor when 'send-all' is 'false'. */
+#define SVN_DAV_NS_DAV_SVN_INLINE_PROPS\
+ SVN_DAV_PROP_NS_DAV "svn/inline-props"
+
+
/** @} */
/** @} */
Modified: subversion/branches/ev2-export/subversion/include/svn_delta.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/svn_delta.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/svn_delta.h (original)
+++ subversion/branches/ev2-export/subversion/include/svn_delta.h Tue Jan 8
23:46:00 2013
@@ -41,7 +41,6 @@
#include "svn_string.h"
#include "svn_io.h"
#include "svn_checksum.h"
-#include "svn_editor.h"
#ifdef __cplusplus
extern "C" {
@@ -1184,29 +1183,6 @@ svn_delta_shim_callbacks_t *
svn_delta_shim_callbacks_default(apr_pool_t *result_pool);
-/** A temporary API which conditionally inserts a double editor shim
- * into the chain of delta editors. Used for testing Editor v2.
- *
- * Whether or not the shims are inserted is controlled by a compile-time
- * option in libsvn_delta/compat.c.
- *
- * @note The use of these shims and this API will likely cause all kinds
- * of performance degredation. (Which is actually a moot point since they
- * don't even work properly yet anyway.)
- *
- * ### This should not ship in the final release.
- */
-svn_error_t *
-svn_editor__insert_shims(const svn_delta_editor_t **deditor_out,
- void **dedit_baton_out,
- const svn_delta_editor_t *deditor_in,
- void *dedit_baton_in,
- const char *repos_root,
- const char *base_dir,
- svn_delta_shim_callbacks_t *shim_callbacks,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/** A text-delta window handler which does nothing.
*
* Editors can return this handler from @c apply_textdelta if they don't
Modified: subversion/branches/ev2-export/subversion/include/svn_fs.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/svn_fs.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/svn_fs.h (original)
+++ subversion/branches/ev2-export/subversion/include/svn_fs.h Tue Jan 8
23:46:00 2013
@@ -39,7 +39,6 @@
#include "svn_io.h"
#include "svn_mergeinfo.h"
#include "svn_checksum.h"
-#include "svn_editor.h"
#ifdef __cplusplus
@@ -1059,118 +1058,6 @@ svn_fs_change_txn_props(svn_fs_txn_t *tx
/** @} */
-/** Editors
- *
- * ### docco
- *
- * @defgroup svn_fs_editor Transaction editors
- * @{
- */
-
-/**
- * Create a new filesystem transaction, based on based on the youngest
- * revision of @a fs, and return its name @a *txn_name and an @a *editor
- * that can be used to make changes into it.
- *
- * @a flags determines transaction enforcement behaviors, and is composed
- * from the constants SVN_FS_TXN_* (#SVN_FS_TXN_CHECK_OOD etc.). It is a
- * property of the underlying transaction, and will not change if multiple
- * editors are used to refer to that transaction (see @a autocommit, below).
- *
- * @note If you're building a txn for committing, you probably don't want
- * to call this directly. Instead, call svn_repos__get_commit_ev2(), which
- * honors the repository's hook configurations.
- *
- * When svn_editor_complete() is called for @a editor, internal resources
- * will be cleaned and nothing more will happen. If you wish to commit the
- * transaction, call svn_fs_editor_commit() instead. It is illegal to call
- * both; the second call will return #SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION.
- *
- * @see svn_fs_commit_txn()
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_editor_create(svn_editor_t **editor,
- const char **txn_name,
- svn_fs_t *fs,
- apr_uint32_t flags,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
-/**
- * Like svn_fs_editor_create(), but open an existing transaction
- * @a txn_name and continue editing it.
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_editor_create_for(svn_editor_t **editor,
- svn_fs_t *fs,
- const char *txn_name,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
-/**
- * Commit the transaction represented by @a editor.
- *
- * If the commit to the filesystem succeeds, then @a *revision will be set
- * to the resulting revision number. Note that further errors may occur,
- * as described below. If the commit process does not succeed, for whatever
- * reason, then @a *revision will be set to #SVN_INVALID_REVNUM.
- *
- * If a conflict occurs during the commit, then @a *conflict_path will
- * be set to a path that caused the conflict. #SVN_NO_ERROR will be returned.
- * Callers may want to construct an #SVN_ERR_FS_CONFLICT error with a
- * message that incorporates @a *conflict_path.
- *
- * If a non-conflict error occurs during the commit, then that error will
- * be returned.
- * As is standard with any Subversion API, @a revision, @a post_commit_err,
- * and @a conflict_path (the OUT parameters) have an indeterminate value if
- * an error is returned.
- *
- * If the commit completes (and a revision is returned in @a *revision), then
- * it is still possible for an error to occur during the cleanup process.
- * Any such error will be returned in @a *post_commit_err. The caller must
- * properly use or clear that error.
- *
- * If svn_editor_complete() has already been called on @a editor, then
- * #SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION will be returned.
- *
- * @note After calling this function, @a editor will be marked as completed
- * and no further operations may be performed on it. The underlying
- * transaction will either be committed or aborted once this function is
- * called. It cannot be recovered for additional work.
- *
- * @a result_pool will be used to allocate space for @a conflict_path.
- * @a scratch_pool will be used for all temporary allocations.
- *
- * @note To summarize, there are three possible outcomes of this function:
- * successful commit (with or without an associated @a *post_commit_err);
- * failed commit due to a conflict (reported via @a *conflict_path); and
- * failed commit for some other reason (reported via the returned error.)
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_editor_commit(svn_revnum_t *revision,
- svn_error_t **post_commit_err,
- const char **conflict_path,
- svn_editor_t *editor,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
-/** @} */
-
-
/** Roots.
*
* An #svn_fs_root_t object represents the root directory of some
Modified: subversion/branches/ev2-export/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/svn_repos.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/svn_repos.h (original)
+++ subversion/branches/ev2-export/subversion/include/svn_repos.h Tue Jan 8
23:46:00 2013
@@ -3169,11 +3169,11 @@ svn_repos_authz_read(svn_authz_t **authz
* allocated in @a pool.
*
* If @a path is not a valid authz rule file, then return
- * SVN_AUTHZ_INVALID_CONFIG. The contents of @a *authz_p is then
+ * #SVN_ERR_AUTHZ_INVALID_CONFIG. The contents of @a *authz_p is then
* undefined. If @a must_exist is TRUE, a missing authz file is also
* an error.
*
- * If @path is a repos relative URL then @a repos_root must be set to
+ * If @a path is a repos relative URL then @a repos_root must be set to
* the root of the repository the authz configuration will be used with.
*
* @since New in 1.8
Modified: subversion/branches/ev2-export/subversion/include/svn_wc.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/svn_wc.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/svn_wc.h (original)
+++ subversion/branches/ev2-export/subversion/include/svn_wc.h Tue Jan 8
23:46:00 2013
@@ -6747,15 +6747,15 @@ typedef enum svn_wc_merge_outcome_t
* svn_diff_file_options_parse()). @a merge_options must contain
* <tt>const char *</tt> elements.
*
- * If @a merge_props_state is non-NULL @a propchanges is merged before
- * merging the text. (If @a merge_props_outcome is NULL, no property changes
-* are merged and @a prop_changes is only used to determine the merge result)
+ * If @a merge_props_state is non-NULL @a prop_diff is merged before
+ * merging the text. (If @a merge_props_state is NULL, no property changes
+ * are merged and @a prop_diff is only used to determine the merge result)
* The result of the property merge is stored in @a *merge_props_state. If
* there is a conflict and @a dry_run is @c FALSE, then attempt to call @a
* conflict_func with @a conflict_baton (if non-NULL). If the conflict
* callback cannot resolve the conflict, then a property conflict is installed.
*
- * The outcome of the text merge is returned in @a *merge_text_outcome. If
+ * The outcome of the text merge is returned in @a *merge_content_outcome. If
* there is a conflict and @a dry_run is @c FALSE, then attempt to call @a
* conflict_func with @a conflict_baton (if non-NULL). If the
* conflict callback cannot resolve the conflict, then:
@@ -6787,7 +6787,8 @@ typedef enum svn_wc_merge_outcome_t
* begins tracking the two backup files and the version information.
*
* If @a dry_run is @c TRUE no files are changed. The outcome of the merge
- * is returned in @a *merge_outcome.
+ * is returned in @a *merge_content_outcome.
+ * ### (and what about @a *merge_props_state?)
*
* Use @a scratch_pool for any temporary allocation.
*
@@ -6816,7 +6817,7 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
void *cancel_baton,
apr_pool_t *scratch_pool);
-/** Similar to svn_wc_merge4() but doesn't allow property changes. Instead of
+/** Similar to svn_wc_merge5() but doesn't merge property changes. Instead of
* handling this in a single operation, a separate call to
svn_wc_merge_props3()
* before calling svn_wc_merge4() is needed
*
Modified: subversion/branches/ev2-export/subversion/libsvn_client/client.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/client.h?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/client.h (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/client.h Tue Jan 8
23:46:00 2013
@@ -744,6 +744,7 @@ svn_client__get_diff_summarize_callbacks
svn_wc_diff_callbacks4_t **callbacks,
void **callback_baton,
const char *target,
+ svn_boolean_t reversed,
svn_client_diff_summarize_func_t summarize_func,
void *summarize_baton,
apr_pool_t *pool);
Modified: subversion/branches/ev2-export/subversion/libsvn_client/commit.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/commit.c?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/commit.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/commit.c Tue Jan 8
23:46:00 2013
@@ -352,8 +352,8 @@ determine_lock_targets(apr_array_header_
target_abspath = svn_dirent_join(base_abspath, target_relpath,
scratch_pool);
- err = svn_wc__get_wc_root(&wcroot_abspath, wc_ctx, target_abspath,
- iterpool, iterpool);
+ err = svn_wc__get_wcroot(&wcroot_abspath, wc_ctx, target_abspath,
+ iterpool, iterpool);
if (err)
{
Modified: subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
(original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c Tue
Jan 8 23:46:00 2013
@@ -302,8 +302,8 @@ bail_on_tree_conflicted_ancestor(svn_wc_
{
const char *wcroot_abspath;
- SVN_ERR(svn_wc__get_wc_root(&wcroot_abspath, wc_ctx, local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, wc_ctx, local_abspath,
+ scratch_pool, scratch_pool));
local_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
Modified: subversion/branches/ev2-export/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/copy.c?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/copy.c Tue Jan 8
23:46:00 2013
@@ -247,6 +247,7 @@ do_wc_to_wc_moves_with_locks2(svn_client
svn_boolean_t lock_src,
svn_boolean_t lock_dst,
svn_boolean_t allow_mixed_revisions,
+ svn_boolean_t metadata_only,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
{
@@ -256,7 +257,7 @@ do_wc_to_wc_moves_with_locks2(svn_client
scratch_pool);
SVN_ERR(svn_wc__move2(ctx->wc_ctx, pair->src_abspath_or_url,
- dst_abspath, FALSE /* metadata_only */,
+ dst_abspath, metadata_only,
allow_mixed_revisions,
ctx->cancel_func, ctx->cancel_baton,
ctx->notify_func2, ctx->notify_baton2,
@@ -272,18 +273,21 @@ do_wc_to_wc_moves_with_locks1(svn_client
svn_boolean_t lock_src,
svn_boolean_t lock_dst,
svn_boolean_t allow_mixed_revisions,
+ svn_boolean_t metadata_only,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
{
if (lock_dst)
SVN_WC__CALL_WITH_WRITE_LOCK(
do_wc_to_wc_moves_with_locks2(pair, dst_parent_abspath, lock_src,
- lock_dst, allow_mixed_revisions, ctx,
- scratch_pool),
+ lock_dst, allow_mixed_revisions,
+ metadata_only,
+ ctx, scratch_pool),
ctx->wc_ctx, dst_parent_abspath, FALSE, scratch_pool);
else
SVN_ERR(do_wc_to_wc_moves_with_locks2(pair, dst_parent_abspath, lock_src,
lock_dst, allow_mixed_revisions,
+ metadata_only,
ctx, scratch_pool));
return SVN_NO_ERROR;
@@ -295,6 +299,7 @@ static svn_error_t *
do_wc_to_wc_moves(const apr_array_header_t *copy_pairs,
const char *dst_path,
svn_boolean_t allow_mixed_revisions,
+ svn_boolean_t metadata_only,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
@@ -350,13 +355,16 @@ do_wc_to_wc_moves(const apr_array_header
SVN_WC__CALL_WITH_WRITE_LOCK(
do_wc_to_wc_moves_with_locks1(pair, pair->dst_parent_abspath,
lock_src, lock_dst,
- allow_mixed_revisions, ctx, iterpool),
+ allow_mixed_revisions,
+ metadata_only,
+ ctx, iterpool),
ctx->wc_ctx, src_parent_abspath,
FALSE, iterpool);
else
SVN_ERR(do_wc_to_wc_moves_with_locks1(pair, pair->dst_parent_abspath,
lock_src, lock_dst,
allow_mixed_revisions,
+ metadata_only,
ctx, iterpool));
}
@@ -1770,6 +1778,7 @@ try_copy(const apr_array_header_t *sourc
const char *dst_path_in,
svn_boolean_t is_move,
svn_boolean_t allow_mixed_revisions,
+ svn_boolean_t metadata_only,
svn_boolean_t make_parents,
svn_boolean_t ignore_externals,
const apr_hash_t *revprop_table,
@@ -2061,9 +2070,15 @@ try_copy(const apr_array_header_t *sourc
if (is_move)
return svn_error_trace(do_wc_to_wc_moves(copy_pairs, dst_path_in,
allow_mixed_revisions,
+ metadata_only,
ctx, pool));
else
- return svn_error_trace(do_wc_to_wc_copies(copy_pairs, ctx, pool));
+ {
+ /* We ignore these values, so assert the default value */
+ SVN_ERR_ASSERT(allow_mixed_revisions == TRUE
+ && metadata_only == FALSE);
+ return svn_error_trace(do_wc_to_wc_copies(copy_pairs, ctx, pool));
+ }
}
else if ((! srcs_are_urls) && (dst_is_url))
{
@@ -2111,6 +2126,7 @@ svn_client_copy6(const apr_array_header_
err = try_copy(sources, dst_path,
FALSE /* is_move */,
TRUE /* allow_mixed_revisions */,
+ FALSE /* metadata_only */,
make_parents,
ignore_externals,
revprop_table,
@@ -2143,6 +2159,7 @@ svn_client_copy6(const apr_array_header_
: svn_dirent_join(dst_path, src_basename, subpool),
FALSE /* is_move */,
TRUE /* allow_mixed_revisions */,
+ FALSE /* metadata_only */,
make_parents,
ignore_externals,
revprop_table,
@@ -2162,6 +2179,7 @@ svn_client_move7(const apr_array_header_
svn_boolean_t move_as_child,
svn_boolean_t make_parents,
svn_boolean_t allow_mixed_revisions,
+ svn_boolean_t metadata_only,
const apr_hash_t *revprop_table,
svn_commit_callback2_t commit_callback,
void *commit_baton,
@@ -2196,8 +2214,9 @@ svn_client_move7(const apr_array_header_
err = try_copy(sources, dst_path,
TRUE /* is_move */,
allow_mixed_revisions,
+ metadata_only,
make_parents,
- FALSE,
+ FALSE /* ignore_externals */,
revprop_table,
commit_callback, commit_baton,
ctx,
@@ -2227,8 +2246,9 @@ svn_client_move7(const apr_array_header_
: svn_dirent_join(dst_path, src_basename, pool),
TRUE /* is_move */,
allow_mixed_revisions,
+ metadata_only,
make_parents,
- FALSE,
+ FALSE /* ignore_externals */,
revprop_table,
commit_callback, commit_baton,
ctx,
Modified: subversion/branches/ev2-export/subversion/libsvn_client/delete.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/delete.c?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/delete.c Tue Jan 8
23:46:00 2013
@@ -426,8 +426,8 @@ svn_client_delete4(const apr_array_heade
APR_ARRAY_IDX(paths, i,
const char *),
pool));
- SVN_ERR(svn_wc__get_wc_root(&wcroot_abspath, ctx->wc_ctx,
- local_abspath, pool, iterpool));
+ SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx,
+ local_abspath, pool, iterpool));
targets = apr_hash_get(wcroots, wcroot_abspath,
APR_HASH_KEY_STRING);
if (targets == NULL)
Modified: subversion/branches/ev2-export/subversion/libsvn_client/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/deprecated.c?rev=1430634&r1=1430633&r2=1430634&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/deprecated.c
(original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/deprecated.c Tue
Jan 8 23:46:00 2013
@@ -744,7 +744,8 @@ svn_client_move6(const apr_array_header_
{
return svn_error_trace(svn_client_move7(src_paths, dst_path,
move_as_child, make_parents,
- TRUE, /* allow_mixed_revisions */
+ TRUE /* allow_mixed_revisions */,
+ FALSE /* metadata_only */,
revprop_table,
commit_callback, commit_baton,
ctx, pool));
