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

Re: svn commit: r27032 - in trunk/subversion/tests/cmdline: . svntest

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-10-09 18:00:04 CEST

>> Based on our discussion[1] yesterday, I changed the expected output.
>>
>> [1]http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=130882
>> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=130873
>>
>
> Kamesh,
>
> Sorry, I don't see the connection. [1] is about the path a notification
> mentions. The change you made in r27032 was to the revision range the
> notification prints:
>

Sorry I misunderstood that.

> --- trunk/subversion/tests/cmdline/merge_tests.py (original)
> +++ trunk/subversion/tests/cmdline/merge_tests.py Mon Oct 8
> 23:58:37 2007
> @@ -7972,7 +7972,7 @@
> A_url + '/D/gamma' + '@4',
> Acopy_gamma_path)
>
> - svntest.actions.run_and_verify_svn(None, expected_merge_output(3,
> + svntest.actions.run_and_verify_svn(None, expected_merge_output(2,
> 'D ' + Acopy_gamma_path + '\n',
> 5),
> [], 'merge', '-r1:5', '--force',
> A_url, Acopy_path)
>
> Closely related issues yes, they are both dealing with merge
> notifications, but still separate concepts yes?
>

Yes, I agree.

Reverted r27040 in r27048, marked the test as XFail, till we arrive at a
consensus.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 9 18:34:25 2007

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