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

RE: svn commit: r33738 - trunk/subversion/tests/cmdline

From: Bert Huijben <bert_at_vmoo.com>
Date: Sun, 19 Oct 2008 02:01:01 +0200

> -----Original Message-----
> From: neels_at_tigris.org [mailto:neels_at_tigris.org]
> Sent: Saturday, October 18, 2008 9:29 PM
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r33738 - trunk/subversion/tests/cmdline
>
> Author: neels
> Date: Sat Oct 18 12:29:23 2008
> New Revision: 33738
>
> Log:
> * subversion/tests/cmdline/merge_tests.py (del_differing_file): Fix
> merge_tests.py 103, its expected output was slightly off.

The buildbots give:

At least one test FAILED, checking <snip>/build/tests.log
XPASS: merge_tests.py 103: merge tries to delete a file of different content

After this commit.

This test should have failed, as it was marked XFail. (I don't see changes besides the tests here).

        Bert

>
> Modified:
> trunk/subversion/tests/cmdline/merge_tests.py
>
> Modified: trunk/subversion/tests/cmdline/merge_tests.py
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/merge_t
> ests.py?pathrev=33738&r1=33737&r2=33738
> =======================================================================
> =======
> --- trunk/subversion/tests/cmdline/merge_tests.py Sat Oct 18
> 12:25:34 2008 (r33737)
> +++ trunk/subversion/tests/cmdline/merge_tests.py Sat Oct 18
> 12:29:23 2008 (r33738)
> @@ -12220,8 +12220,22 @@ def del_differing_file(sbox):
> svntest.actions.run_and_verify_svn(None, None, [], 'propset',
> 'newprop', 'v', target+"/pi")
> # Should complain and "skip" it.
> - svn_merge(s_rev_tau, source, target, 'Skipped.*tau')
> - svn_merge(s_rev_pi, source, target, 'Skipped.*pi')
> + svn_merge(s_rev_tau, source, target, [
> + "Skipped 'A/D/G2/tau'\n",
> + "--- Merging r2 into 'A/D/G2':\n",
> + "C A/D/G2\n",
> + "Summary of conflicts:\n",
> + " Tree conflicts: 1\n",
> + " Skipped paths: 1\n"])
> +
> + svn_merge(s_rev_pi, source, target, [
> + "Skipped 'A/D/G2/pi'\n",
> + "--- Merging r3 into 'A/D/G2':\n",
> + "C A/D/G2\n",
> + "Summary of conflicts:\n",
> + " Tree conflicts: 1\n",
> + " Skipped paths: 1\n"])
> +
>
> # Copy a file, modify it, commit, and merge a deletion to it.
> target = 'A/D/G3'
> @@ -12231,8 +12245,21 @@ def del_differing_file(sbox):
> 'newprop', 'v', target+"/pi")
> svn_commit(target)
> # Should complain and "skip" it.
> - svn_merge(s_rev_tau, source, target, 'Skipped.*tau')
> - svn_merge(s_rev_pi, source, target, 'Skipped.*pi')
> + svn_merge(s_rev_tau, source, target, [
> + "Skipped 'A/D/G3/tau'\n",
> + "--- Merging r2 into 'A/D/G3':\n",
> + "C A/D/G3\n",
> + "Summary of conflicts:\n",
> + " Tree conflicts: 1\n",
> + " Skipped paths: 1\n"])
> +
> + svn_merge(s_rev_pi, source, target, [
> + "Skipped 'A/D/G3/pi'\n",
> + "--- Merging r3 into 'A/D/G3':\n",
> + "C A/D/G3\n",
> + "Summary of conflicts:\n",
> + " Tree conflicts: 1\n",
> + " Skipped paths: 1\n"])
>
> os.chdir(saved_cwd)
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-19 02:01:23 CEST

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