Author: pburba Date: Wed Jan 6 16:58:34 2010 New Revision: 896533 URL: http://svn.apache.org/viewvc?rev=896533&view=rev Log: Merge r896522 from ^/subversion/trunk to ^/subversion/branches/1.6.x-r896522.
No conflicts here, this branch exists only because a fix needs to be done that is unique to 1.6.x, see http://svn.haxx.se/dev/archive-2010-01/0088.shtml. Added: subversion/branches/1.6.x-r896522/subversion/tests/cmdline/resolve_tests.py - copied unchanged from r896522, subversion/trunk/subversion/tests/cmdline/resolve_tests.py Modified: subversion/branches/1.6.x-r896522/ (props changed) subversion/branches/1.6.x-r896522/CHANGES (props changed) Propchange: subversion/branches/1.6.x-r896522/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 6 16:58:34 2010 @@ -52,4 +52,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,879093,879688,880274-880275,880370,880474,880525-880526,881905,884842,886164,886197,888979,889081,889840,895653 +/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880474,880525-880526,881905,884842,886164,886197,888979,889081,889840,895653,896522 Propchange: subversion/branches/1.6.x-r896522/CHANGES ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 6 16:58:34 2010 @@ -51,4 +51,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,895653 +/subversion/trunk/CHANGES:875962-893519,895653,896522
