You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/12/03 23:29:58 UTC
svn commit: r1416704 - in /subversion/trunk/subversion/libsvn_wc:
conflicts.c wc_db.h wc_db_update_move.c
Author: julianfoad
Date: Mon Dec 3 22:29:52 2012
New Revision: 1416704
URL: http://svn.apache.org/viewvc?rev=1416704&view=rev
Log:
Move some parameters into a more conventional order.
* subversion/libsvn_wc/wc_db_update_move.c:
(tc_editor_baton, update_moved_away_conflict_victim_baton): Move some fields.
(get_tc_info, svn_wc__db_update_moved_away_conflict_victim): Swap db and
abspath.
* subversion/libsvn_wc/wc_db_private.h
(svn_wc__db_update_moved_away_conflict_victim): Swap db and relpath.
* subversion/libsvn_wc/conflicts.c
(conflict_status_walker): Track the change.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1416704&r1=1416703&r2=1416704&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Dec 3 22:29:52 2012
@@ -2648,7 +2648,8 @@ conflict_status_walker(void *baton,
{
if (my_choice == svn_wc_conflict_choose_mine_conflict)
SVN_ERR(svn_wc__db_update_moved_away_conflict_victim(
- &work_items, local_abspath, cswb->db,
+ &work_items,
+ cswb->db, local_abspath,
cswb->notify_func, cswb->notify_baton,
cswb->cancel_func, cswb->cancel_baton,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1416704&r1=1416703&r2=1416704&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Mon Dec 3 22:29:52 2012
@@ -3247,8 +3247,8 @@ svn_wc__db_follow_moved_to(apr_array_hea
* need to run as part of marking the conflict resolved. */
svn_error_t *
svn_wc__db_update_moved_away_conflict_victim(svn_skel_t **work_items,
- const char *victim_abspath,
svn_wc__db_t *db,
+ const char *victim_abspath,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
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=1416704&r1=1416703&r2=1416704&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Dec 3 22:29:52 2012
@@ -60,11 +60,11 @@
*/
struct tc_editor_baton {
- const char *move_root_src_relpath;
- const char *move_root_dst_relpath;
+ svn_skel_t **work_items;
svn_wc__db_t *db;
svn_wc__db_wcroot_t *wcroot;
- svn_skel_t **work_items;
+ const char *move_root_src_relpath;
+ const char *move_root_dst_relpath;
svn_wc_conflict_version_t *old_version;
svn_wc_conflict_version_t *new_version;
svn_wc_notify_func2_t notify_func;
@@ -467,8 +467,8 @@ get_tc_info(svn_wc_operation_t *operatio
svn_wc_conflict_action_t *incoming_change,
svn_wc_conflict_version_t **old_version,
svn_wc_conflict_version_t **new_version,
- const char *src_abspath,
svn_wc__db_t *db,
+ const char *src_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -809,13 +809,13 @@ drive_tree_conflict_editor(svn_editor_t
struct update_moved_away_conflict_victim_baton {
svn_skel_t **work_items;
+ svn_wc__db_t *db;
const char *victim_relpath;
svn_wc_operation_t operation;
svn_wc_conflict_reason_t local_change;
svn_wc_conflict_action_t incoming_change;
svn_wc_conflict_version_t *old_version;
svn_wc_conflict_version_t *new_version;
- svn_wc__db_t *db;
svn_wc_notify_func2_t notify_func;
void *notify_baton;
svn_cancel_func_t cancel_func;
@@ -884,8 +884,8 @@ update_moved_away_conflict_victim(void *
svn_error_t *
svn_wc__db_update_moved_away_conflict_victim(svn_skel_t **work_items,
- const char *victim_abspath,
svn_wc__db_t *db,
+ const char *victim_abspath,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
@@ -903,8 +903,8 @@ svn_wc__db_update_moved_away_conflict_vi
svn_wc_conflict_version_t *new_version;
SVN_ERR(get_tc_info(&operation, &local_change, &incoming_change,
- &old_version, &new_version,
- victim_abspath, db, scratch_pool, scratch_pool));
+ &old_version, &new_version, db, victim_abspath,
+ scratch_pool, scratch_pool));
SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath,
db, victim_abspath,