summaryrefslogtreecommitdiff
path: root/subversion/svn/merge-cmd.c
diff options
context:
space:
mode:
Diffstat (limited to 'subversion/svn/merge-cmd.c')
-rw-r--r--subversion/svn/merge-cmd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/subversion/svn/merge-cmd.c b/subversion/svn/merge-cmd.c
index 17507a2..cbc818b 100644
--- a/subversion/svn/merge-cmd.c
+++ b/subversion/svn/merge-cmd.c
@@ -37,10 +37,6 @@
#include "svn_private_config.h"
-/* A handy constant */
-static const svn_opt_revision_t unspecified_revision
- = { svn_opt_revision_unspecified, { 0 } };
-
/*** Code. ***/
@@ -127,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,