Author: pburba Revision: 1146874 Modified property: svn:log Modified: svn:log at Thu Jul 14 20:10:46 2011 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Thu Jul 14 20:10:46 2011 @@ -4,7 +4,7 @@ On the 1.6.x-issue3957 branch: Merge r11 No conflicts, just a few tweaks to run properly on 1.6.x. Note: Since r1146121 on trunk was made to merge_reintegrate_tests, I merged -from ^/subversion/trunk/subversion/tests/cmdline/merge_tests.py directly to -merge_tests.py on the branch to avoid the tree conflict. This shouldn't -cause any problems when reintegrating back to 1.6.x as long as a 1.7 client -is used. +from ^/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py +directly to merge_tests.py on the branch to avoid the tree conflict. This +shouldn't cause any problems when reintegrating back to 1.6.x as long as a +1.7 client is used.
