Author: julianfoad
Date: Thu Nov 22 16:01:55 2018
New Revision: 1847182
URL: http://svn.apache.org/viewvc?rev=1847182&view=rev
Log:
Fix issue SVN-4792: Foreign repo copy of file adding mergeinfo.
* subversion/libsvn_client/copy.c
(repos_to_wc_copy_single): Only copy mergeinfo if it's the same repository.
* subversion/tests/cmdline/copy_tests.py
(foreign_repos_to_wc): Remove XFail.
Modified:
subversion/trunk/subversion/tests/cmdline/copy_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1847182&r1=1847181&r2=1847182&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Thu Nov 22 16:01:55
2018
@@ -1021,7 +1021,6 @@ def repos_to_wc(sbox):
os.path.join(D_dir, 'B'))
#----------------------------------------------------------------------
-@XFail()
def foreign_repos_to_wc(sbox):
"foreign repository to WC copy"
