client-side

Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Various spelling fixes, no functional change

* contrib/client-side/svn-clean

(--exclude): s/exluded/excluded/

* subversion/include/svn_error_codes.h

(SVN_ERR_X509_CERT_VERIFY_FAILED): s/Certficate/Certificate/

* subversion/po/de.po,

subversion/po/ja.po,

subversion/po/ko.po,

subversion/po/pl.po,

subversion/po/sv.po:

(): s/Certficate/Certificate/; s/abandonded/abandoned/

* subversion/libsvn_repos/repos.c:

(): s/abandonded/abandoned/

* subversion/libsvn_repos/repos.c,

subversion/svnadmin/svnadmin.c,

subversion/tests/libsvn_client/client-test.c:

(): s/filesytem/filesystem/

  1. … 9 more files in changeset.
Fix broken cleanup in svn_load_dirs.pl.

* contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in (DESTROY):

Change cwd to the parent of the directory to remove.

Patch by: Geoffrey Alary <geoffrey.alary{_AT_}gmail.com>

Do not print password to screen in svn_load_dirs.pl.

* contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in

(sanitize_pwd): New function.

(safe_read_from_pipe, read_from_process): Update the sites printing

the command line to screen to use sanitize_pwd.

(usage): Warn that other local OS users may be able to see the

password passed on the command-line.

Fix indentation; that is, replace the 2 tab occurrences by 8 spaces.

Patch by: Geoffrey Alary <geoffrey.alary{_AT_}gmail.com>

* contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in: Unbreak, after r1838539.

(The breakage was my fault, not jon's.)

* contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in:

Add missing peg revision escaping, in case the filename contains an "@"

sign.

Patch by: jon <jon@beniston.com>

(tweaked by me)

Update issue tracker links in comments, from Tigris (issuezilla) to Apache (Jira).

URL fragment identifiers like '#desc5' are left in place, not yet updated.

This is a merge of r1828508 from the 'shelve-checkpoint' branch where I

committed it by mistake.

  1. … 41 more files in changeset.
Yet another round of making our usage of "print" syntactically compatible

with Python 2 and 3 alike.

This is probably the last mass change in the py2/3 compatibility patch set.

Following commits will be a lot more local and specific.

* build/run_tests.py

* contrib/client-side/incremental-update.py

* contrib/client-side/svn_export_empty_files.py

* contrib/client-side/svn-hgmerge.py

* contrib/client-side/svnmerge/svnmerge-migrate-history.py

* contrib/client-side/svnmerge/svnmerge.py

* contrib/client-side/svn-merge-vendor.py

* contrib/hook-scripts/hook_toolbox.py

* contrib/hook-scripts/remove-zombie-locks.py

* contrib/server-side/fsfsfixer/fixer/find_good_id.py

* contrib/server-side/fsfsfixer/fixer/fix-rev.py

* contrib/server-side/fsfsverify.py

* notes/directory-index/dirindex.py

* subversion/tests/cmdline/svntest/main.py

* subversion/tests/manual/tree-conflicts-add-vs-add.py

* tools/dev/benchmarks/RepoPerf/win_repo_bench.py

* tools/dev/benchmarks/suite1/benchmark.py

* tools/dev/gen-py-errors.py

* tools/dev/merge-graph.py

* tools/dev/wc-ng/bump-to-19.py

* tools/dist/collect_sigs.py

* tools/server-side/svnpubsub/irkerbridge.py

(): Make sure to use parantheses in print statements to make them

function calls in py3. Where we print to stderr / stdout, write

the to respective sys streams.

  1. … 16 more files in changeset.
Work towards Python 3 compatibility. Since we already require Python 2.7+,

we can use the new syntax without further limiting our Python 2 support.

Fix leftovers to complete the replacement of print statements with function

calls.

* contrib/client-side/svn-merge-vendor.py

(del_temp_tree): Use a simple function call.

* contrib/server-side/fsfsverify.py

(__main__): Use the write function to output on stdout. Re-add the

previously automatic newline.

* tools/server-side/svn-backup-dumps.py

(SvnBackupOutputCommand): This one is printing a tuple. The function

call needs double parantheses here.

  1. … 2 more files in changeset.
Work towards Python 3 compatibility. Since we already require Python 2.7+,

we can use the new syntax without further limiting our Python 2 support.

* contrib/client-side/incremental-update.py

* contrib/client-side/svn_export_empty_files.py

* contrib/client-side/svnmerge/svnmerge.py

* contrib/server-side/svn-tweak-author.py

* subversion/tests/cmdline/merge_automatic_tests.py

* tools/dev/benchmarks/RepoPerf/win_repo_bench.py

* tools/dev/merge-graph.py

(): Replace occurances of Python 2 print statements with continuation

comma by writes to stdout. Don't forget to explicitly add the space

character that print would have added one.

  1. … 4 more files in changeset.
Work towards Python 3 compatibility. Since we already require Python 2.7+,

we can use the new syntax without further limiting our Python 2 support.

* contrib/client-side/svnmerge/svnmerge.py

* tools/dev/mergegraph/save_as_sh.py

(): Replace occurances of Python 2 print statements to files with calls

to the file write function. Don't forget to explicitly add a

newline print would have added one.

  1. … 1 more file in changeset.
Work towards Python 3 compatibility. Since we already require Python 2.7+,

we can use the new syntax without further limiting our Python 2 support.

* contrib/client-side/svn_export_empty_files.py

* contrib/client-side/svnmerge/svnmerge-migrate-history.py

* contrib/client-side/svnmerge/svnmerge.py

* contrib/client-side/svn-merge-vendor.py

* contrib/server-side/add-needs-lock.py

* contrib/server-side/fsfsfixer/fixer/find_good_id.py

* contrib/server-side/fsfsverify.py

* tools/dev/mergegraph/mergegraph.py

(): Replace occurances of Python 2 print statements to std streams

with calls to the stream's write function. Don't forget

to explicitly print a newline.

  1. … 4 more files in changeset.
Work towards Python 3 compatibility. Since we already require Python 2.7+,

we can use the new syntax without further limiting our Python 2 support.

* contrib/client-side/incremental-update.py

* contrib/client-side/svn_export_empty_files.py

* contrib/client-side/svnmerge/svnmerge.py

* contrib/hook-scripts/hook_toolbox.py

* contrib/hook-scripts/remove-zombie-locks.py

* contrib/server-side/add-needs-lock.py

* contrib/server-side/fsfsfixer/fixer/find_good_id.py

* contrib/server-side/fsfsfixer/fixer/fix-rev.py

* contrib/server-side/fsfsverify.py

* contrib/server-side/svn-tweak-author.py

* notes/directory-index/dirindex.py

* notes/move-tracking/path_pairs_to_eid_map.py

* subversion/tests/cmdline/svntest/main.py

* subversion/tests/cmdline/svntest/verify.py

* subversion/tests/manual/tree-conflicts-add-vs-add.py

* tools/client-side/mergeinfo-sanitizer.py

* tools/dev/benchmarks/RepoPerf/copy_repo.py

* tools/dev/benchmarks/suite1/benchmark.py

* tools/dev/gen-py-errors.py

* tools/dev/histogram.py

* tools/dev/sbox-ospath.py

* tools/dev/wc-format.py

* tools/dev/wc-ng/bump-to-19.py

* tools/dist/collect_sigs.py

* tools/examples/get-location-segments.py

* tools/server-side/svnpredumpfilter.py

* tools/server-side/svnpubsub/irkerbridge.py

* tools/server-side/svnpubsub/svntweet.py

(): Replace occurances of Python 2 print statements with calls to the

Python 3 style print function. Note that this is not exhaustive

and there are still several non-trival uses of print statements

not covered by this patch.

  1. … 25 more files in changeset.
Work towards Python 3 compatibility. Since we already require Python 2.7+,

we can use the new syntax without further limiting our Python 2 support.

* contrib/client-side/incremental-update.py

* contrib/client-side/svn_apply_autoprops.py

* contrib/client-side/svnmerge/svnmerge-migrate-history.py

* contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py

* contrib/client-side/svnmerge/svnmerge.py

* contrib/client-side/svnmerge/svnmerge_test.py

* contrib/server-side/add-needs-lock.py

* contrib/server-side/fsfsfixer/fixer/fix-rev.py

* contrib/server-side/fsfsverify.py

* contrib/server-side/svn-tweak-author.py

* subversion/bindings/swig/python/tests/core.py

* subversion/bindings/swig/python/tests/repository.py

* subversion/tests/cmdline/svntest/actions.py

* subversion/tests/cmdline/svntest/main.py

* subversion/tests/cmdline/svntest/objects.py

* subversion/tests/cmdline/svntest/wc.py

* subversion/tests/cmdline/upgrade_tests.py

* tools/client-side/change-svn-wc-format.py

* tools/client-side/mergeinfo-sanitizer.py

* tools/dev/contribulyze.py

* tools/dev/gen-javahl-errors.py

* tools/dev/gen_junit_report.py

* tools/dev/graph-dav-servers.py

* tools/dev/iz/ff2csv.py

* tools/dev/iz/find-fix.py

* tools/dev/wc-ng/bump-to-19.py

* tools/dev/wc-ng/populate-pristine.py

* tools/dev/which-error.py

* tools/examples/get-location-segments.py

* tools/hook-scripts/svn2feed.py

* tools/hook-scripts/svnperms.py

* tools/po/l10n-report.py

* tools/server-side/fsfs-reshard.py

* tools/server-side/svn-backup-dumps.py

* tools/server-side/svnpredumpfilter.py

* tools/server-side/svnpubsub/daemonize.py

* tools/server-side/test_svn_server_log_parse.py

(): Replace all occurances of "except Type, variable:" with Python 3

style "except Type as variable".

  1. … 31 more files in changeset.
Merge the pin-externals branch to trunk.

The discussion thread start in this post:

http://mail-archives.apache.org/mod_mbox/subversion-dev/201501.mbox/%3C20150128095434.GM26869%40ted.stsp.name%3E

has come to a consensus that the branch can be merged and additional

development of this feature can happen on trunk.

This merge adds a '--pin-externals' option to 'svn copy'.

This option enables automated pinning of URLs in svn:externals properties

during copy operations (issue #1258).

--pin-externals : pin externals with no explicit revision to their

last-changed revision (recommended when tagging)

This feature makes the svncopy.pl contrib script unnecessary.

Externals are "pinned" by adding a peg revision to the external's source URL.

For example, the external definition:

^/foo/bar ext_bar

might become:

^/foo/bar@400 ext_bar

This table shows which revision is used for pinning:

copy source: working copy (WC) REPOS

------------+------------------------+---------------------------+

copy WC | external's WC BASE rev | external's repos HEAD rev |

dest: |------------------------+---------------------------+

REPOS | external's WC BASE rev | external's repos HEAD rev |

------------+------------------------+---------------------------+

An external that is already pinned is left as-is.

Please see the branch log for details about these changes.

  1. … 22 more files in changeset.
Fix some typos.

* CHANGES:

* contrib/cgi/mirror_dir_through_svn.cgi:

* contrib/client-side/emacs/psvn.el:

* contrib/client-side/svn2cl/svn2cl.xsl:

* contrib/hook-scripts/remove-zombie-locks.py:

* contrib/hook-scripts/syntax-check.sh:

* contrib/server-side/svnstsw/configure.ac:

* notes/assurance.txt:

* notes/fs-improvements.txt:

* notes/knobs:

* notes/merge-tracking/func-spec.html:

* notes/merge-tracking/summit-survey.html:

* notes/wc-ng/design:

* notes/wc-ng/locking:

* notes/wc-ng/nodes:

* subversion/bindings/ctypes-python/csvn/core/__init__.py:

* subversion/bindings/ctypes-python/examples/example.py:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java:

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java:

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java:

* subversion/bindings/swig/include/proxy_apr.swg:

* subversion/bindings/swig/perl/native/Client.pm:

* subversion/bindings/swig/perl/native/t/3client.t:

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c:

* subversion/include/private/svn_diff_tree.h:

* subversion/include/private/svn_io_private.h:

* subversion/include/private/svn_ra_svn_private.h:

* subversion/include/private/svn_string_private.h:

* subversion/include/svn_io.h:

* subversion/include/svn_iter.h:

* subversion/include/svn_props.h:

* subversion/libsvn_client/copy_foreign.c:

* subversion/libsvn_client/diff.c:

* subversion/libsvn_client/merge.c:

* subversion/libsvn_delta/xdelta.c:

* subversion/libsvn_diff/diff4.c:

* subversion/libsvn_diff/util.c:

* subversion/libsvn_fs/editor.c:

* subversion/libsvn_fs_fs/index.c:

* subversion/libsvn_fs_fs/temp_serializer.c:

* subversion/libsvn_fs_fs/temp_serializer.h:

* subversion/libsvn_fs_fs/transaction.c:

* subversion/libsvn_fs_fs/tree.c:

* subversion/libsvn_fs_x/fs.h:

* subversion/libsvn_fs_x/index.c:

* subversion/libsvn_fs_x/reps.c:

* subversion/libsvn_fs_x/temp_serializer.c:

* subversion/libsvn_fs_x/temp_serializer.h:

* subversion/libsvn_fs_x/transaction.c:

* subversion/libsvn_fs_x/tree.c:

* subversion/libsvn_ra_serf/README:

* subversion/libsvn_ra_svn/protocol:

* subversion/libsvn_repos/dump.c:

* subversion/libsvn_repos/hooks.c:

* subversion/libsvn_repos/load-fs-vtable.c:

* subversion/libsvn_subr/dirent_uri.c:

* subversion/libsvn_subr/io.c:

* subversion/libsvn_subr/opt.c:

* subversion/libsvn_subr/string.c:

* subversion/libsvn_subr/subst.c:

* subversion/libsvn_wc/entries.c:

* subversion/libsvn_wc/externals.c:

* subversion/libsvn_wc/lock.c:

* subversion/libsvn_wc/update_editor.c:

* subversion/svn/file-merge.c:

* subversion/svn/status-cmd.c:

* subversion/svnlook/svnlook.c:

* subversion/svnrdump/load_editor.c:

* subversion/svnserve/svnserve.c:

* subversion/tests/cmdline/commit_tests.py:

* subversion/tests/cmdline/diff_tests.py:

* subversion/tests/cmdline/merge_reintegrate_tests.py:

* subversion/tests/cmdline/merge_tests.py:

* subversion/tests/cmdline/revert_tests.py:

* subversion/tests/cmdline/svnauthz_tests.py:

* subversion/tests/cmdline/svntest/factory.py:

* subversion/tests/cmdline/svntest/main.py:

* subversion/tests/libsvn_repos/repos-test.c:

* subversion/tests/libsvn_subr/string-test.c:

* subversion/tests/libsvn_subr/utf-test.c:

* subversion/tests/libsvn_wc/db-test.c:

* subversion/tests/svn_test_main.c:

* tools/dev/trails.py: Fix some typos.

Patch by: Veres Lajos <vlajos{_AT_}gmail.com>

(I removed some changes that were wrong or can't be made due to API breakage)

  1. … 89 more files in changeset.
Fix some typos.

* CHANGES:

* contrib/client-side/emacs/psvn.el:

* contrib/client-side/svn-merge-vendor.py:

* contrib/hook-scripts/remove-zombie-locks.py:

* contrib/server-side/svnmirror.sh:

* contrib/server-side/svnmirror-test.sh:

* notes/meetings/berlin-11-agenda:

* notes/unicode-composition-for-filenames:

* notes/wc-ng/conflict-storage:

* notes/wc-ng/conflict-storage-2.0:

* subversion/bindings/ctypes-python/test/wc.py:

* subversion/bindings/cxxhl/src/aprwrap/hash.hpp:

* subversion/bindings/cxxhl/tests/test_aprwrap.cpp:

* subversion/bindings/javahl/native/JNICriticalSection.h:

* subversion/bindings/javahl/native/JNIUtil.cpp:

* subversion/bindings/javahl/native/jniwrapper/jni_env.hpp:

* subversion/bindings/javahl/native/NativeStream.hpp:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java:

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java:

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java:

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java:

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java:

* subversion/bindings/swig/perl/native/Client.pm:

* subversion/include/private/svn_sqlite.h:

* subversion/include/private/svn_subr_private.h:

* subversion/include/svn_client.h:

* subversion/include/svn_client_mtcc.h:

* subversion/include/svn_diff.h:

* subversion/libsvn_fs_fs/rep-cache.c:

* subversion/libsvn_fs_x/rep-cache.c:

* subversion/libsvn_ra_serf/options.c:

* subversion/libsvn_subr/io.c:

* subversion/libsvn_subr/string.c:

* subversion/libsvn_subr/utf8proc.c:

* subversion/libsvn_wc/adm_crawler.c:

* subversion/libsvn_wc/diff_local.c:

* subversion/libsvn_wc/wc_db_update_move.c:

* subversion/libsvn_wc/wc-metadata.sql:

* subversion/svn/status-cmd.c:

* subversion/tests/cmdline/diff_tests.py:

* subversion/tests/cmdline/merge_tests.py:

* subversion/tests/cmdline/README:

* subversion/tests/cmdline/svnadmin_tests.py:

* subversion/tests/cmdline/svnauthz_tests.py:

* subversion/tests/cmdline/svndumpfilter_tests.py:

* subversion/tests/cmdline/svnrdump_tests.py:

* subversion/tests/cmdline/svntest/factory.py:

* subversion/tests/libsvn_wc/wc-queries-test.c:

* tools/dev/build-svn-deps-win.pl: Fix some typos.

  1. … 50 more files in changeset.
Since "svn status" is run for every file because of the removed check

for .svn in every directory, don't complain if it fails. The check is

made more robust by adding @ to the file name, for files whose names

contain that character.

* contrib/client-side/emacs/vc-svn.el

(vc-svn-run-status): Append @ to the file name.

(vc-svn-parse-status): Don't complain on error.

Suggested by: Karl Berry

Remove an incorrect check for whether a file may be under version control.

The check made the file useless with modern working copy formats.

* contrib/client-side/emacs/dsvn.el

(vc-svn-registered): Don't look for ".svn/entries".

Suggested by: Karl Berry

Finish issue #4151 ("patch for svncopy.pl option --file").

* contrib/client-side/svncopy/svncopy.pl.in

Teach this script to absorb the --file option processing rather than

trying to pass the option off verbatim to 'svn' subcommands which

don't even accept it (such as 'checkout').

Patch by: dario.borreguero{_AT_}gmail.com

Use svn-diff-args everywhere svn diff is called. This rectifies an

earlier omission.

* contrib/client-side/emacs/dsvn.el

(svn-call-process): Signature change.

(svn-log-show-diff): Use svn-diff-args.

Allow svn-resolve (R) on lines with tree conflicts as well, not just

text conflicts.

* contrib/client-side/emacs/dsvn.el

(svn-resolve): Accept lines with tree conflicts.

In this revision a mass spelling correction OCCURRED (not occured).

* subversion/bindings/javahl/native/Path.cpp,

subversion/bindings/javahl/native/Path.h

(m_error_occured): Rename to 'm_error_occurred'.

(error_occured): Rename to 'error_occurred'.

* subversion/bindings/javahl/native/Targets.cpp,

subversion/bindings/javahl/native/Targets.h

(Targets): Same.

* subversion/bindings/javahl/native/SVNClient.cpp

Track the renames.

* subversion/bindings/swig/perl/native/Repos.pm

(get_logs): Fix spelling in a doc string.

* subversion/libsvn_subr/cache_config.c

(svn_cache__get_global_membuffer_cache): Fix spelling in a comment.

* subversion/tests/libsvn_subr/stream-test.c

(test_stream_base64_2): Fix spelling in a doc string.

* tools/server-side/svn-backup-dumps.py

(__main__): Fix spelling in printed output.

* contrib/client-side/svnmerge/svnmerge_test.py

(TestCase_TestRepo.testMergeAndRollbackEmptyRevisionRange): Fix spelling

in a doc string.

  1. … 9 more files in changeset.
When committing unversioned files or directories, add them after asking the

user. Doing so helps in the common situation when the user has forgotten to

add files before marking files for a commit and does not want to start all

over.

* contrib/client-side/emacs/dsvn.el

(svn-add-unversioned-files-p): New function.

(svn-commit): Gather unversioned files and, if any, add them after asking.

(svn-actions): Rewrite, to allow actual use of the predicate.

Remove the mistake "the the" from various files.

* subversion/libsvn_repos/repos.c

(create_conf): Tweak svnserve.conf text.

* subversion/include/svn_dav.h

(SVN_DAV_VTXN_NAME_HEADER): Tweak comment.

* subversion/include/svn_mergeinfo.h

(svn_rangelist_intersect): Tweak comment.

* subversion/include/svn_wc.h

(svn_wc_conflict_version_create2, svn_wc_add4): Tweak comment.

* subversion/libsvn_fs_base/dag.c

(svn_fs_base__things_different): Tweak comment.

* subversion/libsvn_fs_base/uuid.h

(svn_fs_base__populate_uuid): Tweak comment.

* subversion/libsvn_fs_fs/fs_fs.c

(get_revprop_packname, hotcopy_io_dir_file_copy): Tweak comment.

* subversion/libsvn_subr/base64.c

(BASE64_LINELEN): Tweak comment.

* subversion/libsvn_subr/cache-membuffer.c: Tweak comment.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_global_commit): Tweak comment.

* contrib/client-side/emacs/psvn.el

(svn-status-goto-file-name): Tweak comment.

* contrib/hook-scripts/enforcer/enforcer: Tweak comment.

* notes/merge-tracking/func-spec.html: Tweak text.

  1. … 12 more files in changeset.
When running svn status for checking whether a tree is clean, skip lines

starting with "X" in the output; they just indicate externals. Those

lines were not present in the output before 1.7 but now cause svnmerge.py

to refuse working (on trees with externals) without this change.

(This script is somewhat orphaned by now, but the change was

acknowledged by Giovanni Bajo.)

* contrib/client-side/svnmerge/svnmerge.py

(check_dir_clean): Skip lines starting with "X".

Run svn diff with -x -p by default (because that is what is useful for

source code), and allow the user to customise these options.

* contrib/client-side/emacs/dsvn.el

(svn-diff-args): New defcustom.

(svn-diff, svn-log-diff, svn-diff-file): Use svn-diff-args.

Tweak white space around uses of 'SVN_VERSION_DEFINE' macro which declares a

variable and so should be grouped as a declaration rather than a statement.

* subversion/svnadmin/main.c,

subversion/svndumpfilter/main.c,

subversion/svnlook/main.c,

subversion/svn/main.c,

subversion/svnserve/main.c,

subversion/svnsync/main.c,

subversion/svnversion/main.c,

tools/dev/svnraisetreeconflict/main.c,

tools/server-side/svn-rep-sharing-stats.c,

contrib/client-side/svn-push/svn-push.c

(check_lib_versions): Group SVN_VERSION_DEFINE with the declarations.

* subversion/svnmucc/svnmucc.c

(init): Same.

  1. … 10 more files in changeset.
Make the Emacs client code handle tree conflicts more gracefully, instead of

giving up, signalling an error or emitting nonsensical messages.

* contrib/client-side/emacs/dsvn.el

(svn-status-filter, svn-status-v-filter, svn-update-filter): Parse svn output

with tree conflicts better, and annotate the corresponding items with the

detailed conflict message.

(svn-update-status-msg): Left-align message for consistency.

(svn-update-conflict-msg): New.

* contrib/client-side/emacs/vc-svn.el

(vc-svn-parse-status): Parse output from "svn status -v" in a way that is

more tolerant of tree conflicts and locks.

* contrib/client-side/vim/svn.vim: Remove.

This is now owned by upstream; see issue #4158.

Swallow the "Updating 'DIR':" message; it isn't useful.

* contrib/client-side/emacs/dsvn.el

(svn-update-filter): Match and delete message.