You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/14 06:01:29 UTC
svn commit: r1482188 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/diff_editor.c subversion/tests/cmdline/diff_tests.py
Author: svn-role
Date: Tue May 14 04:01:29 2013
New Revision: 1482188
URL: http://svn.apache.org/r1482188
Log:
Merge r1426830 from trunk:
* r1426830
Resolve issue #3797, by making sure that local changes at the same path
as a not present file are not skipped.
Justification:
Improves 'svn diff' handling of local changes.
Votes:
+1: rhuijben, pburba, stsp
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/diff_editor.c
subversion/branches/1.7.x/subversion/tests/cmdline/diff_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1426830
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1482188&r1=1482187&r2=1482188&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue May 14 04:01:29 2013
@@ -283,14 +283,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1426830
- Resolve issue #3797, by making sure that local changes at the same path
- as a not present file are not skipped.
- Justification:
- Improves 'svn diff' handling of local changes.
- Votes:
- +1: rhuijben, pburba, stsp
-
* r1451678, r1452617
Make get-deps.sh compatible with Solaris /bin/sh.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/diff_editor.c?rev=1482188&r1=1482187&r2=1482188&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/diff_editor.c Tue May 14 04:01:29 2013
@@ -1281,11 +1281,10 @@ add_directory(const char *path,
dir_pool);
*child_baton = db;
- /* Add this path to the parent directory's list of elements that
- have been compared. */
- apr_hash_set(pb->compared, apr_pstrdup(pb->pool, db->path),
- APR_HASH_KEY_STRING, "");
-
+ /* Issue #3797: Don't add this filename to the parent directory's list of
+ elements that have been compared, to show local additions via the local
+ diff. The repository node is unrelated from the working copy version
+ (similar to not-present in the working copy) */
return SVN_NO_ERROR;
}
@@ -1430,10 +1429,10 @@ add_file(const char *path,
fb = make_file_baton(path, TRUE, pb, file_pool);
*file_baton = fb;
- /* Add this filename to the parent directory's list of elements that
- have been compared. */
- apr_hash_set(pb->compared, apr_pstrdup(pb->pool, path),
- APR_HASH_KEY_STRING, "");
+ /* Issue #3797: Don't add this filename to the parent directory's list of
+ elements that have been compared, to show local additions via the local
+ diff. The repository node is unrelated from the working copy version
+ (similar to not-present in the working copy) */
return SVN_NO_ERROR;
}
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/diff_tests.py?rev=1482188&r1=1482187&r2=1482188&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/diff_tests.py Tue May 14 04:01:29 2013
@@ -3281,7 +3281,6 @@ def diff_url_against_local_mods(sbox):
#----------------------------------------------------------------------
# Diff against old revision of the parent directory of a removed and
# locally re-added file.
-@XFail()
@Issue(3797)
def diff_preexisting_rev_against_local_add(sbox):
"diff -r1 of dir with removed-then-readded file"