diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2016-12-01 07:45:05 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2016-12-01 07:45:05 +0000 |
| commit | 608944fa5a78d7f517c9c73a7ded6c130cc97b83 (patch) | |
| tree | 9dce7c56ce4cbd36bb5457661d50b23d30c3533c /subversion/svn/merge-cmd.c | |
| parent | c94cceea9c2262c5b2ad5f215bb9a8ae48b02764 (diff) | |
Notes
Diffstat (limited to 'subversion/svn/merge-cmd.c')
| -rw-r--r-- | subversion/svn/merge-cmd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/subversion/svn/merge-cmd.c b/subversion/svn/merge-cmd.c index 6feda4cd1bff4..cbc818b89f7cc 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, |