Author: stsp
Revision: 1205528
Modified property: svn:log
Modified: svn:log at Wed Nov 23 18:25:30 2011
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Nov 23 18:25:30 2011
@@ -1,4 +1,4 @@
-On the moves-scan-log branch, hook the moves-log scanning logic into to the
+On the moves-scan-log branch, hook the moves-log scanning logic into the
interactive conflict resolution callback system.
For now, this is triggered only on delete vs. delete conflicts.
@@ -12,7 +12,7 @@ However, this feedback is not evaluated
This is mostly a checkpoint commit to get these changes off my hard drive.
* subversion/include/svn_wc.h
- (svn_wc_repos_move_info_t): Move defintion futher up in this file.
+ (svn_wc_repos_move_info_t): Move definition further up in this file.
(svn_wc_conflict_description2_t): New fields suggested_move and
server_sends_moves_as_copy_plus_delete. See docstrings for details.
(svn_wc_conflict_choice_t): Add new choices scan_log_for_moves,
@@ -63,5 +63,5 @@ This is mostly a checkpoint commit to ge
the interactive conflict resolution callback upon delete vs. delete tree
conflicts.
(add_directory, open_directory, add_file, open_file): Stop passing the
- moved_to_abspath paramer to check_tree_conflict(). This breaks some
+ moved_to_abspath parameter to check_tree_conflict(). This breaks some
tree conflict auto-resolution behaviour which will be restored later.
