subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r895675 - in /subversion/branches/1.6.x: ./ CHANGES STATUS subversion/bindings/swig/python/tests/mergeinfo.py
Date Mon, 04 Jan 2010 16:11:44 GMT
Author: hwright
Date: Mon Jan  4 16:11:43 2010
New Revision: 895675

URL: http://svn.apache.org/viewvc?rev=895675&view=rev
Log:
Merge r895653 from trunk:

 * r895653
   Update test expectations in the swig-py tests to take the recent mergeinfo
   canonicalization changes into account.
   Justification:
     Passing tests are Good.
   Votes:
     +1: hwright, rhuijben
     +1: stsp (via irc)

Modified:
    subversion/branches/1.6.x/   (props changed)
    subversion/branches/1.6.x/CHANGES   (props changed)
    subversion/branches/1.6.x/STATUS
    subversion/branches/1.6.x/subversion/bindings/swig/python/tests/mergeinfo.py

Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 16:11:43 2010
@@ -50,4 +50,4 @@
 /subversion/branches/tc_url_rev:870696-870828
 /subversion/branches/tree-conflicts:864636-869499
 /subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879688,880274-880275,880370,880474,880525-880526,881905,884842,886164,886197,888979,889081,889840
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879688,880274-880275,880370,880474,880525-880526,881905,884842,886164,886197,888979,889081,889840,895653

Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  4 16:11:43 2010
@@ -49,4 +49,4 @@
 /subversion/branches/tc_url_rev/CHANGES:870696-870828
 /subversion/branches/tree-conflicts/CHANGES:864636-869499
 /subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-893519
+/subversion/trunk/CHANGES:875962-893519,895653

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=895675&r1=895674&r2=895675&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Mon Jan  4 16:11:43 2010
@@ -186,13 +186,3 @@
      The relevant commit on the branch is r879175.
    Votes:
      +1: pburba, julianfoad, rhuijben
-
-
- * r895653
-   Update test expectations in the swig-py tests to take the recent mergeinfo
-   canonicalization changes into account.
-   Justification:
-     Passing tests are Good.
-   Votes:
-     +1: hwright, rhuijben
-     +1: stsp (via irc)

Modified: subversion/branches/1.6.x/subversion/bindings/swig/python/tests/mergeinfo.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/bindings/swig/python/tests/mergeinfo.py?rev=895675&r1=895674&r2=895675&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/bindings/swig/python/tests/mergeinfo.py (original)
+++ subversion/branches/1.6.x/subversion/bindings/swig/python/tests/mergeinfo.py Mon Jan 
4 16:11:43 2010
@@ -107,10 +107,10 @@
                                        False, None, None)
     expected_mergeinfo = \
       { '/trunk' :
-          { 'branches/a' : [RevRange(2, 11)],
-            'branches/b' : [RevRange(9, 13)],
-            'branches/c' : [RevRange(2, 16)],
-            'trunk'      : [RevRange(1, 9)],  },
+          { '/branches/a' : [RevRange(2, 11)],
+            '/branches/b' : [RevRange(9, 13)],
+            '/branches/c' : [RevRange(2, 16)],
+            '/trunk'      : [RevRange(1, 9)],  },
       }
     self.compare_mergeinfo_catalogs(mergeinfo, expected_mergeinfo)
 



Mime
View raw message