[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Tue, 15 Mar 2011 15:21:43 +0530

On 03/14/2011 08:18 PM, Stefan Sperling wrote:
> 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
>> +@XFail()
>> +def dry_run_merge_conflicting_binary(sbox):
>> + "dry run shouldn't make conflict resoln files"
> ^^^^^
> typo?

Thanks Stefan. Fixed in r1081703.

With regards
Kamesh Jayachandran
Received on 2011-03-15 10:50:23 CET

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