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/02/19 16:42:19 UTC
svn propchange: r1447770 - svn:log
Author: stsp
Revision: 1447770
Modified property: svn:log
Modified: svn:log at Tue Feb 19 15:42:19 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Feb 19 15:42:19 2013
@@ -1,5 +1,5 @@
In the move-update code, make the mark_tree_conflict() function more generic
-by replacing its tc_editor_baton "bag of paramaters" argument with a list
+by replacing its tc_editor_baton "bag of parameters" argument with a list
of individual parameters.
This allows the mark_tree_conflict() function to be reused more easily from
@@ -9,7 +9,7 @@ contexts other than the update-move edit
(mark_tree_conflict): Replace baton argument with individual parameters.
Stop marking b->conflict_root_relpath within this function and rely on
callers that want to update the path to do so themselves.
- Rename some local variables to avoid overlap with new paramter names.
+ Rename some local variables to avoid overlap with new parameter names.
(check_tree_conflict, tc_editor_add_directory,
tc_editor_add_file, tc_editor_delete, bump_mark_tree_conflict,
resolve_delete_raise_moved_away): Update callers. Some of these were