You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by bl...@apache.org on 2012/05/13 05:51:46 UTC
svn propchange: r1336219 - svn:log
Author: blair
Revision: 1336219
Modified property: svn:log
Modified: svn:log at Sun May 13 03:51:46 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sun May 13 03:51:46 2012
@@ -1,7 +1,8 @@
Make the symmetric merge tests a bit more robust.
* subversion/tests/cmdline/merge_symmetric_tests.py
- (modify_branch): Always add a file as well as a property, so that we can
- always detect repeated application of the same change.
- (expected_symmetric_merge_output): Accept either form of merge notifications: 'differences between repository URLs' or 'r3 to r5'.
+ (modify_branch): Always add a file as well as a property, so that we
+ can always detect repeated application of the same change.
+ (expected_symmetric_merge_output): Accept either form of merge
+ notifications: 'differences between repository URLs' or 'r3 to r5'.
(symmetric_merge): Delete an irrelevant comment from the doc string.