subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1196050 - in /subversion/trunk/subversion: svn/copy-cmd.c tests/cmdline/copy_tests.py
Date Tue, 01 Nov 2011 15:22:51 GMT
Author: julianfoad
Date: Tue Nov  1 15:22:50 2011
New Revision: 1196050

URL: http://svn.apache.org/viewvc?rev=1196050&view=rev
Log:
Remove the special exemption for '@HEAD' on the destination path of
'svn copy', since that was only introduced recently in response to
issue #3651 'svn copy does not eat peg revision within copy target path',
the resolution of which did not require that. A follow-up to r1196005.

* subversion/svn/copy-cmd.c
  (svn_cl__copy): Don't make an exception for '@HEAD' on the destination.

* subversion/tests/cmdline/copy_tests.py
  (copy_peg_rev_url): Test copying to a path ending in '@' rather than
    in '@HEAD'.

Modified:
    subversion/trunk/subversion/svn/copy-cmd.c
    subversion/trunk/subversion/tests/cmdline/copy_tests.py

Modified: subversion/trunk/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/copy-cmd.c?rev=1196050&r1=1196049&r2=1196050&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/copy-cmd.c (original)
+++ subversion/trunk/subversion/svn/copy-cmd.c Tue Nov  1 15:22:50 2011
@@ -83,8 +83,7 @@ svn_cl__copy(apr_getopt_t *os,
     svn_opt_revision_t peg;
 
     SVN_ERR(svn_opt_parse_path(&peg, &dst_path, tgt, pool));
-    if (peg.kind != svn_opt_revision_unspecified
-        && peg.kind != svn_opt_revision_head /* special exemption */)
+    if (peg.kind != svn_opt_revision_unspecified)
       return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
                                _("'%s': a peg revision is not allowed here"),
                                tgt);

Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1196050&r1=1196049&r2=1196050&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Tue Nov  1 15:22:50 2011
@@ -3444,11 +3444,12 @@ def copy_peg_rev_url(sbox):
                                      wc_dir)
 
   # Copy using a peg rev
-  # Add peg rev '@HEAD' to sigma_url when copying which tests for issue #3651.
+  # Add an empty peg specifier ('@') to sigma_url when copying, to test for
+  # issue #3651 "svn copy does not eat peg revision within copy target path".
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'cp',
                                      iota_url + '@HEAD', '-r', '1',
-                                     sigma_url + '@HEAD', '-m', 'rev 3')
+                                     sigma_url + '@', '-m', 'rev 3')
 
   # Validate the copy destination's mergeinfo (we expect none).
   svntest.actions.run_and_verify_svn(None, [], [],



Mime
View raw message