Author: kameshj Date: Sat Dec 5 02:43:59 2009 New Revision: 887484 URL: http://svn.apache.org/viewvc?rev=887484&view=rev Log: Fix a bug in which "update" did not propagate the local changes in a file(copy source) when the incoming change is a simple rename/copy of locally changed file(copy source), if the file was directly under the repository root. If the file was not immediately under the root, it did.
There is a test case in the email thread http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2427104 * subversion/libsvn_wc/update_editor.c (locate_copyfrom): Remove an erroneous early return. Reviewed by: julianfoad Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=887484&r1=887483&r2=887484&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original) +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sat Dec 5 02:43:59 2009 @@ -3346,8 +3346,6 @@ ancestor_relpath = svn_relpath_get_longest_ancestor(dir_repos_relpath, copyfrom_relpath, scratch_pool); - if (strlen(ancestor_relpath) == 0) - return SVN_NO_ERROR; /* Move 'up' the working copy to what ought to be the common ancestor dir. */ levels_up = svn_path_component_count(dir_repos_relpath)
