[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-commits
Subject: svn commit: r1771909 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
From: stsp () apache ! org
Date: 2016-11-29 14:19:44
Message-ID: 20161129141945.521D93A0EB1 () svn01-us-west ! apache ! org
[Download RAW message or body]
Author: stsp
Date: Tue Nov 29 14:19:44 2016
New Revision: 1771909
URL: http://svn.apache.org/viewvc?rev=1771909&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(tc_editor_merge_local_file_change): Rename to ...
(tc_editor_update_incoming_moved_file): ... this.
(update_incoming_moved_node): Update caller.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1771909&r1=1771908&r2=1771909&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Nov 29 14:19:44 \
2016 @@ -1421,15 +1421,15 @@ tc_editor_alter_file(node_move_baton_t *
}
static svn_error_t *
-tc_editor_merge_local_file_change(node_move_baton_t *nmb,
- const char *dst_relpath,
- const char *src_relpath,
- const svn_checksum_t *src_checksum,
- const svn_checksum_t *dst_checksum,
- apr_hash_t *dst_props,
- apr_hash_t *src_props,
- svn_boolean_t do_text_merge,
- apr_pool_t *scratch_pool)
+tc_editor_update_incoming_moved_file(node_move_baton_t *nmb,
+ const char *dst_relpath,
+ const char *src_relpath,
+ const svn_checksum_t *src_checksum,
+ const svn_checksum_t *dst_checksum,
+ apr_hash_t *dst_props,
+ apr_hash_t *src_props,
+ svn_boolean_t do_text_merge,
+ apr_pool_t *scratch_pool)
{
update_move_baton_t *b = nmb->umb;
working_node_version_t old_version, new_version;
@@ -2512,13 +2512,14 @@ update_incoming_moved_node(node_move_bat
FALSE /* exact_comparison */,
scratch_pool));
if (!props_equal || is_modified)
- SVN_ERR(tc_editor_merge_local_file_change(nmb, dst_relpath,
- victim_relpath,
- working_checksum,
- orig_checksum,
- orig_props, working_props,
- is_modified,
- scratch_pool));
+ SVN_ERR(tc_editor_update_incoming_moved_file(nmb, dst_relpath,
+ victim_relpath,
+ working_checksum,
+ orig_checksum,
+ orig_props,
+ working_props,
+ is_modified,
+ scratch_pool));
}
else if (working_kind == svn_node_dir)
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic