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 2012/09/29 06:02:24 UTC
svn commit: r1391748 - in /subversion/branches/1.7.x: ./ STATUS
subversion/tests/cmdline/stat_tests.py
Author: svn-role
Date: Sat Sep 29 04:02:23 2012
New Revision: 1391748
URL: http://svn.apache.org/viewvc?rev=1391748&view=rev
Log:
Reintegrate the 1.7.x-r1389928 branch:
* r1389928
Fix a 1.7.x test to pass within a format 30 working copy.
Justification:
Convenience for users of trunk clients.
Branch:
^/subversion/branches/1.7.x-r1389928
Votes:
+1: stsp, cmpilato, brane
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/tests/cmdline/stat_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1389928
Merged /subversion/branches/1.7.x-r1389928:r1390384-1391747
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1391748&r1=1391747&r2=1391748&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Sep 29 04:02:23 2012
@@ -145,12 +145,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1389928
- Fix a 1.7.x test to pass within a format 30 working copy.
- Justification:
- Convenience for users of trunk clients.
- Branch:
- ^/subversion/branches/1.7.x-r1389928
- Votes:
- +1: stsp, cmpilato, brane
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/stat_tests.py?rev=1391748&r1=1391747&r2=1391748&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/stat_tests.py Sat Sep 29 04:02:23 2012
@@ -990,11 +990,16 @@ def status_ignored_dir(sbox):
def status_unversioned_dir(sbox):
"status on unversioned dir"
sbox.build(read_only = True)
- dir = sbox.repo_dir
- expected_err = "svn: warning: W155007: '.*(/|\\\\)" + os.path.basename(dir) + \
+
+ # Create two unversioned directories within the test working copy
+ path = sbox.ospath('1/2')
+ os.makedirs(path)
+
+ expected_err = "svn: warning: W1550(07|10): .*'.*(/|\\\\)" + \
+ os.path.basename(path) + \
"' is not a working copy"
svntest.actions.run_and_verify_svn2(None, [], expected_err, 0,
- "status", dir, dir)
+ "status", path)
#----------------------------------------------------------------------