subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1349821 - /subversion/trunk/subversion/svn/merge-cmd.c
Date Wed, 13 Jun 2012 13:05:40 GMT
Author: julianfoad
Date: Wed Jun 13 13:05:40 2012
New Revision: 1349821

URL: http://svn.apache.org/viewvc?rev=1349821&view=rev
Log:
* subversion/svn/merge-cmd.c
  (svn_cl__merge): Error out if the user specifies a revision range with
    --symmetric, as that is not a supported case for symmetric merge (it is
    a cherry-pick).

Modified:
    subversion/trunk/subversion/svn/merge-cmd.c

Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1349821&r1=1349820&r2=1349821&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Wed Jun 13 13:05:40 2012
@@ -393,6 +393,10 @@ svn_cl__merge(apr_getopt_t *os,
       if (two_sources_specified)
         return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
                                 _("SOURCE2 can't be used with --symmetric"));
+      if (first_range_start.kind != svn_opt_revision_unspecified
+          || first_range_end.kind != svn_opt_revision_unspecified)
+        return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                                _("a revision range can't be used with --symmetric"));
 
       SVN_ERR_W(svn_cl__check_related_source_and_target(
                   sourcepath1, &peg_revision1, targetpath, &unspecified,



Mime
View raw message