You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/05/09 16:28:50 UTC
svn commit: r1480664 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Thu May 9 14:28:50 2013
New Revision: 1480664
URL: http://svn.apache.org/r1480664
Log:
* subversion/svn/conflict-callbacks.c
(handle_prop_conflict): Don't allow 'r' to be used if no merged property
value exists yet. Fix indentation while here.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1480664&r1=1480663&r2=1480664&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu May 9 14:28:50 2013
@@ -1011,9 +1011,17 @@ handle_prop_conflict(svn_wc_conflict_res
}
else if (strcmp(opt->code, "r") == 0)
{
- result->merged_file = merged_file_path;
- result->choice = svn_wc_conflict_choose_merged;
- break;
+ if (! resolved_allowed)
+ {
+ SVN_ERR(svn_cmdline_fprintf(stderr, iterpool,
+ _("Invalid option; please edit the property "
+ "first.\n\n")));
+ continue;
+ }
+
+ result->merged_file = merged_file_path;
+ result->choice = svn_wc_conflict_choose_merged;
+ break;
}
else if (opt->choice != -1)
{