You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/12/05 18:31:40 UTC
svn commit: r1210541 [2/2] - in /subversion/branches/moves-scan-log: ./
subversion/include/ subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_delta/ subversion/libsvn_fs_fs/ subversion/libsvn_repos/
subversion/libsvn_subr/ subvers...
Modified: subversion/branches/moves-scan-log/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/tests/cmdline/log_tests.py?rev=1210541&r1=1210540&r2=1210541&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/branches/moves-scan-log/subversion/tests/cmdline/log_tests.py Mon Dec 5 17:31:39 2011
@@ -2093,6 +2093,45 @@ def merge_sensitive_log_copied_path_inhe
log_chain = parse_log_output(out)
check_merge_results(log_chain, expected_merges)
+#----------------------------------------------------------------------
+def log_diff(sbox):
+ "'svn log --diff'"
+
+ guarantee_repos_and_wc(sbox)
+
+ was_cwd = os.getcwd()
+ os.chdir(sbox.wc_dir)
+
+ exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+ 'log', '--diff')
+ os.chdir(was_cwd)
+
+ for line in output:
+ if line.startswith('Index:'):
+ break
+ else:
+ raise SVNLogParseError("no diffs found in log output")
+
+ # After a copy, a log of the copy destination used to fail because the
+ # diff tried to use the head-revision URL with the old revision numbers
+ # without using the correct peg revision.
+
+ sbox.simple_copy('A', 'A2')
+ sbox.simple_commit()
+
+ os.chdir(sbox.wc_dir)
+ exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+ 'log', '--diff',
+ '-r10:8', 'A2')
+ os.chdir(was_cwd)
+
+ for line in output:
+ if line.startswith('Index:'):
+ break
+ else:
+ raise SVNLogParseError("no diffs found in log output")
+
+
########################################################################
# Run the tests
@@ -2133,6 +2172,7 @@ test_list = [ None,
log_with_unrelated_peg_and_operative_revs,
log_on_nonexistent_path_and_valid_rev,
merge_sensitive_log_copied_path_inherited_mergeinfo,
+ log_diff,
]
if __name__ == '__main__':
Modified: subversion/branches/moves-scan-log/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/tests/cmdline/stat_tests.py?rev=1210541&r1=1210540&r2=1210541&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/branches/moves-scan-log/subversion/tests/cmdline/stat_tests.py Mon Dec 5 17:31:39 2011
@@ -1945,6 +1945,10 @@ def modified_modulo_translation(sbox):
svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
'status', wc_dir)
+ # Expect the file to be renormalized (to LF) after a revert.
+ sbox.simple_revert('iota')
+ svntest.actions.run_and_verify_svn(None, [], [], 'status', wc_dir)
+
########################################################################
# Run the tests
Modified: subversion/branches/moves-scan-log/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/tools/dev/unix-build/Makefile.svn?rev=1210541&r1=1210540&r2=1210541&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/moves-scan-log/tools/dev/unix-build/Makefile.svn Mon Dec 5 17:31:39 2011
@@ -1352,7 +1352,8 @@ endif
.PHONY: libpath
libpath:
- @echo export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH
+ @echo export LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \
+ "PYTHONPATH=$(SVN_PREFIX)/lib/svn-python"
.PHONY: start-svnserve stop-svnserve start-httpd stop-httpd