aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/svn
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2016-12-01 07:45:05 +0000
committerPeter Wemm <peter@FreeBSD.org>2016-12-01 07:45:05 +0000
commit608944fa5a78d7f517c9c73a7ded6c130cc97b83 (patch)
tree9dce7c56ce4cbd36bb5457661d50b23d30c3533c /subversion/svn
parentc94cceea9c2262c5b2ad5f215bb9a8ae48b02764 (diff)
downloadsrc-608944fa5a78d7f517c9c73a7ded6c130cc97b83.tar.gz
src-608944fa5a78d7f517c9c73a7ded6c130cc97b83.zip
Import subversion-1.9.5.vendor/subversion/subversion-1.9.5
This includes a security fix for a component that we do not build, and two potentially useful client side fixes for reintegrate merges and tree conflict handling. See CHANGES for full details.
Notes
Notes: svn path=/vendor/subversion/dist/; revision=309354 svn path=/vendor/subversion/subversion-1.9.5/; revision=309355; tag=vendor/subversion/subversion-1.9.5
Diffstat (limited to 'subversion/svn')
-rw-r--r--subversion/svn/info-cmd.c2
-rw-r--r--subversion/svn/merge-cmd.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/subversion/svn/info-cmd.c b/subversion/svn/info-cmd.c
index 0040986207c7..fafc398c5f6c 100644
--- a/subversion/svn/info-cmd.c
+++ b/subversion/svn/info-cmd.c
@@ -764,7 +764,7 @@ print_info_item_revision(svn_revnum_t rev, const char *target_path,
if (target_path)
SVN_ERR(svn_cmdline_printf(pool, "%-10ld %s", rev, target_path));
else
- SVN_ERR(svn_cmdline_printf(pool, "%-10ld", rev));
+ SVN_ERR(svn_cmdline_printf(pool, "%ld", rev));
}
else if (target_path)
SVN_ERR(svn_cmdline_printf(pool, "%-10s %s", "", target_path));
diff --git a/subversion/svn/merge-cmd.c b/subversion/svn/merge-cmd.c
index 6feda4cd1bff..cbc818b89f7c 100644
--- a/subversion/svn/merge-cmd.c
+++ b/subversion/svn/merge-cmd.c
@@ -123,6 +123,11 @@ run_merge(svn_boolean_t two_sources_specified,
_("Merge sources must both be "
"either paths or URLs"));
+ if (svn_path_is_url(targetpath))
+ return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("Merge target '%s' must be a local path "
+ "but looks like a URL"), targetpath);
+
if (opt_state->verbose)
SVN_ERR(svn_cmdline_printf(scratch_pool, _("--- Merging\n")));
merge_err = svn_client_merge5(sourcepath1,