svn commit: r1081390 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

[Stefan Sperling]

Author: kameshj
Date: Mon Mar 14 14:24:58 2011
New Revision: 1081390
URL: http://svn.apache.org/viewvc?rev=1081390&view=rev
Adds an XFail test to catch regression created by r1075802
* subversion/tests/cmdline/merge_tests.py
(dry_run_merge_conflicting_binary): New XFail testcase.
(test_list): Add dry_run_merge_conflicting_binary.
Patch by: Arwin Arni <arwin{_AT_}collab.net>
subversion/trunk/subversion/tests/cmdline/merge_tests.py
+ "dry run shouldn't make conflict resoln files"

^^^^^
typo?

[Stefan Sperling]

Author: kameshj
Date: Mon Mar 14 14:24:58 2011
New Revision: 1081390
URL: http://svn.apache.org/viewvc?rev=1081390&view=rev
Adds an XFail test to catch regression created by r1075802
* subversion/tests/cmdline/merge_tests.py
(dry_run_merge_conflicting_binary): New XFail testcase.
(test_list): Add dry_run_merge_conflicting_binary.
Patch by: Arwin Arni <arwin{_AT_}collab.net>
subversion/trunk/subversion/tests/cmdline/merge_tests.py

This test prints garbage (i.e. non-UTF-8) to the screen in UTF-8 terminals.

Is there a way to prevent it from showing the expected content of
a binary file?

Excerpt of output (which might look different on your screen than
it does on mine, but whatever):

Couldn't find node 'theta.merge-left.r2' in expected disk tree
* Node name: theta.merge-left.r2
Path: __SVN_ROOT_NODE/A/theta.merge-left.r2
Contents: [
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]

[Kamesh Jayachandran]

Author: kameshj
Date: Mon Mar 14 14:24:58 2011
New Revision: 1081390
URL: http://svn.apache.org/viewvc?rev=1081390&view=rev
Adds an XFail test to catch regression created by r1075802
* subversion/tests/cmdline/merge_tests.py
(dry_run_merge_conflicting_binary): New XFail testcase.
(test_list): Add dry_run_merge_conflicting_binary.
Patch by: Arwin Arni<arwin{_AT_}collab.net>
subversion/trunk/subversion/tests/cmdline/merge_tests.py
+ "dry run shouldn't make conflict resoln files"

^^^^^
typo?

Thanks Stefan. Fixed in r1081703.

With regards
Kamesh Jayachandran