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 13:22:36 UTC
svn commit: r1447696 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Tue Feb 19 12:22:36 2013
New Revision: 1447696
URL: http://svn.apache.org/r1447696
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(suitable_for_move): Rephrase error message shown for mixed-rev/switched
move sources. Also print a separate error message for reach failure case,
so it is easier to see which condition is preventing a move-update.
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=1447696&r1=1447695&r2=1447696&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Feb 19 12:22:36 2013
@@ -1775,15 +1775,28 @@ suitable_for_move(svn_wc__db_wcroot_t *w
relpath = svn_relpath_skip_ancestor(local_relpath, relpath);
relpath = svn_relpath_join(repos_relpath, relpath, iterpool);
- if (revision != node_revision
- || strcmp(relpath, svn_sqlite__column_text(stmt, 1, NULL)))
+ if (revision != node_revision)
return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
svn_sqlite__reset(stmt),
- _("The tree '%s' is not single-revision and unswitched"),
- svn_dirent_local_style(svn_dirent_join(wcroot->abspath,
- local_relpath,
- scratch_pool),
- scratch_pool));
+ _("Cannot apply update because move source "
+ "%s' is a mixed-revision working copy"),
+ svn_dirent_local_style(svn_dirent_join(
+ wcroot->abspath,
+ local_relpath,
+ scratch_pool),
+ scratch_pool));
+
+ if (strcmp(relpath, svn_sqlite__column_text(stmt, 1, NULL)))
+ return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
+ svn_sqlite__reset(stmt),
+ _("Cannot apply update because move source "
+ "'%s' is a switched subtree"),
+ svn_dirent_local_style(svn_dirent_join(
+ wcroot->abspath,
+ local_relpath,
+ scratch_pool),
+ scratch_pool));
+
SVN_ERR(svn_sqlite__step(&have_row, stmt));
}
SVN_ERR(svn_sqlite__reset(stmt));