You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/01/16 22:27:42 UTC
svn commit: r1434414 - /subversion/trunk/subversion/libsvn_wc/diff_local.c
Author: rhuijben
Date: Wed Jan 16 21:27:42 2013
New Revision: 1434414
URL: http://svn.apache.org/viewvc?rev=1434414&view=rev
Log:
* subversion/libsvn_wc/diff_local.c
(file_diff): Don't overwrite the already obtained correct
original_repos_relpath with the version from the op-root.
Modified:
subversion/trunk/subversion/libsvn_wc/diff_local.c
Modified: subversion/trunk/subversion/libsvn_wc/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_local.c?rev=1434414&r1=1434413&r2=1434414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_local.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_local.c Wed Jan 16 21:27:42 2013
@@ -204,11 +204,10 @@ file_diff(struct diff_baton *eb,
the latter two have corresponding pristine info to diff against. */
if (status == svn_wc__db_status_added)
SVN_ERR(svn_wc__db_scan_addition(&status, NULL, NULL, NULL, NULL,
- &original_repos_relpath, NULL, NULL,
+ NULL, NULL, NULL,
NULL, NULL, NULL, db, local_abspath,
scratch_pool, scratch_pool));
-
SVN_ERR(get_empty_file(eb, &empty_file, scratch_pool));
/* When we show a delete, we show a diff of the original pristine against