You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by pb...@apache.org on 2010/01/26 23:47:55 UTC

svn commit: r903466 - /subversion/branches/1.6.x-r891672/

Author: pburba
Date: Tue Jan 26 22:47:54 2010
New Revision: 903466

URL: http://svn.apache.org/viewvc?rev=903466&view=rev
Log:
Redo the merge of r891672 from ^/subversion/trunk to
^/subversion/branches/1.6.x-r891672 made in r892189.

As discussed here, http://svn.haxx.se/dev/archive-2010-01/0615.shtml, this
merge inexplicably did not set mergeinfo.

As discussed here, http://svn.haxx.se/dev/archive-2010-01/0616.shtml, the
lack of mergeinfo may have something to do with some merge problems
encountered when repeating the merge of ^/subversion/branches/1.6.x-r891672
back to ^/subversion/branches/1.6.x.

Modified:
    subversion/branches/1.6.x-r891672/   (props changed)

Propchange: subversion/branches/1.6.x-r891672/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 26 22:47:54 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,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,876299,876306,876427,876440,876450,876507,876571,879688,880274-880275,880370,880474,880525-880526,881905,884842,886164,886197,888979,889081,889840,891672