Author: stsp
Date: Mon Feb 25 17:31:36 2013
New Revision: 1449783
URL: http://svn.apache.org/r1449783
Log:
* subversion/libsvn_wc/conflicts.c
(resolve_tree_conflict_on_node): Some tree conflicts can now be resolved
not just to 'working' but also to 'mine-conflict', so update error messages
shown for invalid --accept arguments accordingly.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1449783&r1=1449782&r2=1449783&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Feb 25 17:31:36 2013
@@ -2674,8 +2674,7 @@ resolve_tree_conflict_on_node(svn_skel_t
db, local_abspath, scratch_pool));
did_resolve = TRUE;
}
-
- if (conflict_choice == svn_wc_conflict_choose_mine_conflict)
+ else if (conflict_choice == svn_wc_conflict_choose_mine_conflict)
{
/* Raised moved-away conflicts on any children moved out of
* this directory, and leave this directory deleted.
@@ -2686,6 +2685,14 @@ resolve_tree_conflict_on_node(svn_skel_t
scratch_pool));
did_resolve = TRUE;
}
+ else
+ return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
+ NULL,
+ _("Tree conflict can only be resolved to "
+ "'working' or 'mine-conflict' state; "
+ "'%s' not resolved"),
+ svn_dirent_local_style(local_abspath,
+ scratch_pool));
}
else if (reason == svn_wc_conflict_reason_moved_away
&& action == svn_wc_conflict_action_edit)
@@ -2717,6 +2724,14 @@ resolve_tree_conflict_on_node(svn_skel_t
scratch_pool));
did_resolve = TRUE;
}
+ else
+ return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
+ NULL,
+ _("Tree conflict can only be resolved to "
+ "'working' or 'mine-conflict' state; "
+ "'%s' not resolved"),
+ svn_dirent_local_style(local_abspath,
+ scratch_pool));
}
}
