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 2010/06/30 17:55:42 UTC
svn commit: r959358 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: julianfoad
Date: Wed Jun 30 15:55:42 2010
New Revision: 959358
URL: http://svn.apache.org/viewvc?rev=959358&view=rev
Log:
Fix the last two SVN_EXPERIMENTAL_PRISTINE test failures,
tree_conflict_tests 2 and update_tests 52.
* subversion/libsvn_wc/update_editor.c
(add_file_with_history): Hack around the behaviour of locate_copyfrom().
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=959358&r1=959357&r2=959358&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Jun 30 15:55:42 2010
@@ -3566,9 +3566,14 @@ add_file_with_history(struct dir_baton *
SVN_ERR(svn_wc__get_entry(&src_entry, db, src_local_abspath, FALSE,
svn_node_file, FALSE, subpool, subpool));
- SVN_ERR(svn_wc__get_ultimate_base_contents(&source_text_base,
- db, src_local_abspath,
- subpool, subpool));
+ if (src_entry->schedule == svn_wc_schedule_add)
+ SVN_ERR(svn_wc__get_pristine_contents(&source_text_base,
+ db, src_local_abspath,
+ subpool, subpool));
+ else
+ SVN_ERR(svn_wc__get_ultimate_base_contents(&source_text_base,
+ db, src_local_abspath,
+ subpool, subpool));
/* If this has no base, should we use an empty stream?
* This assert wants to verify that there are no such callers. */