[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 14 Mar 2011 17:58:35 +0100

On Mon, Mar 14, 2011 at 02:24:58PM -0000, kameshj_at_apache.org wrote:
> Author: kameshj
> Date: Mon Mar 14 14:24:58 2011
> New Revision: 1081390
>
> URL: http://svn.apache.org/viewvc?rev=1081390&view=rev
> Log:
> 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>
>
> Modified:
> 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: [
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
[������������������]
[
]
Received on 2011-03-14 17:59:09 CET

This is an archived mail posted to the Subversion Dev mailing list.