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 2018/11/13 04:00:12 UTC
svn commit: r1846478 - in /subversion/branches/1.10.x: ./ STATUS
subversion/libsvn_client/copy.c subversion/tests/cmdline/copy_tests.py
Author: svn-role
Date: Tue Nov 13 04:00:12 2018
New Revision: 1846478
URL: http://svn.apache.org/viewvc?rev=1846478&view=rev
Log:
Merge the r1846403 group from trunk:
* r1846403, r1846406
Issue #SVN-4785: Fix foreign repo copy with peg/operative revisions.
Justification:
It has been broken since first introduced in 1.8.
Votes:
+1: julianfoad, brane, rhuijben
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_client/copy.c
subversion/branches/1.10.x/subversion/tests/cmdline/copy_tests.py
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 13 04:00:12 2018
@@ -102,4 +102,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264,184
4882,1845204,1845261,1845408,1845555,1845577
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264,184
4882,1845204,1845261,1845408,1845555,1845577,1846403,1846406
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1846478&r1=1846477&r2=1846478&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Nov 13 04:00:12 2018
@@ -41,10 +41,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1846403, r1846406
- Issue #SVN-4785: Fix foreign repo copy with peg/operative revisions.
- Justification:
- It has been broken since first introduced in 1.8.
- Votes:
- +1: julianfoad, brane, rhuijben
Modified: subversion/branches/1.10.x/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_client/copy.c?rev=1846478&r1=1846477&r2=1846478&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_client/copy.c Tue Nov 13 04:00:12 2018
@@ -2453,7 +2453,7 @@ repos_to_wc_copy_single(svn_boolean_t *t
{
*timestamp_sleep = TRUE;
- SVN_ERR(svn_client__copy_foreign(pair->src_abspath_or_url,
+ SVN_ERR(svn_client__copy_foreign(pair->src_original,
dst_abspath,
&pair->src_peg_revision,
&pair->src_op_revision,
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/copy_tests.py?rev=1846478&r1=1846477&r2=1846478&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/copy_tests.py Tue Nov 13 04:00:12 2018
@@ -1021,6 +1021,56 @@ def repos_to_wc(sbox):
os.path.join(D_dir, 'B'))
#----------------------------------------------------------------------
+def foreign_repos_to_wc(sbox):
+ "foreign repository to WC copy"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ def move_url(repo_url, source, dest):
+ svntest.main.run_svn(False, 'move', '-m', svntest.main.make_log_msg(),
+ repo_url + '/' + source,
+ repo_url + '/' + dest)
+
+ # We have a standard repository and working copy. Now we create a
+ # second repository with the same greek tree, but different UUID.
+ repo_dir = sbox.repo_dir
+ other_repo_dir, other_repo_url = sbox.add_repo_path('other')
+ svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 1)
+ move_url(other_repo_url, 'A', 'A2')
+ move_url(other_repo_url, 'A2', 'A3')
+
+ # URL->wc copy:
+ # copy a file and a directory from a foreign repository.
+ # we should get some scheduled additions *without history*.
+ E_url = other_repo_url + "/A2/B/E"
+ pi_url = other_repo_url + "/A2/D/G/pi"
+ peg_rev = '2'
+ op_rev = '1'
+ E_url_resolved = E_url.replace('/A2/', '/A/')
+ pi_url_resolved = pi_url.replace('/A2/', '/A/')
+
+ expected_output = svntest.verify.UnorderedOutput([
+ '--- Copying from foreign repository URL \'%s\':\n' % E_url_resolved,
+ 'A %s\n' % sbox.ospath('E'),
+ 'A %s\n' % sbox.ospath('E/beta'),
+ 'A %s\n' % sbox.ospath('E/alpha'),
+ ])
+ svntest.actions.run_and_verify_svn(expected_output, [],
+ 'copy', '-r' + op_rev,
+ E_url + '@' + peg_rev,
+ wc_dir)
+
+ expected_output = [
+ '--- Copying from foreign repository URL \'%s\':\n' % pi_url_resolved,
+ 'A %s\n' % sbox.ospath('pi'),
+ ]
+ svntest.actions.run_and_verify_svn(expected_output, [],
+ 'copy', '-r' + op_rev,
+ pi_url + '@' + peg_rev,
+ wc_dir)
+
+#----------------------------------------------------------------------
# Issue 1084: ra_svn move/copy bug
@Issue(1084)
def copy_to_root(sbox):
@@ -5955,6 +6005,7 @@ test_list = [ None,
ext_wc_copy_deleted,
copy_subtree_deleted,
resurrect_at_root,
+ foreign_repos_to_wc,
]
if __name__ == '__main__':