subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1659298 - /subversion/trunk/subversion/tests/cmdline/move_tests.py
Date Thu, 12 Feb 2015 16:09:56 GMT
Author: philip
Date: Thu Feb 12 16:09:56 2015
New Revision: 1659298

URL: http://svn.apache.org/r1659298
Log:
* subversion/tests/cmdline/move_tests.py
  (move_conflict_details): Expect relative path.

Modified:
    subversion/trunk/subversion/tests/cmdline/move_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1659298&r1=1659297&r2=1659298&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Thu Feb 12 16:09:56 2015
@@ -1635,8 +1635,7 @@ def move_conflict_details(sbox):
       "Path" : re.escape(sbox.ospath('B')),
       
       "Conflict Properties File" :
-            re.escape(os.path.abspath(sbox.ospath('B/dir_conflicts.prej'))) +
-            '.*',
+            re.escape(sbox.ospath('B/dir_conflicts.prej')) + '.*',
       "Conflict Details": re.escape(
             'incoming dir edit upon update' +
             ' Source  left: (dir) ^/A/B@1' +



Mime
View raw message