On 03/14/2011 08:18 PM, Stefan Sperling wrote:
On Mon, Mar 14, 2011 at 02:24:58PM -0000, kame...@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
