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

RE: svn commit: r1301390 - in /subversion/trunk/subversion/tests/cmdline: svntest/sandbox.py update_tests.py

From: Bert Huijben <bert_at_qqmail.nl>
Date: Fri, 16 Mar 2012 11:18:54 +0100

> -----Original Message-----
> From: philip_at_apache.org [mailto:philip_at_apache.org]
> Sent: vrijdag 16 maart 2012 10:30
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1301390 - in /subversion/trunk/subversion/tests/cmdline:
> svntest/sandbox.py update_tests.py
>
> Author: philip
> Date: Fri Mar 16 09:29:49 2012
> New Revision: 1301390
>
> URL: http://svn.apache.org/viewvc?rev=1301390&view=rev
> Log:
> Fallout from the multi-layer-move merge: updates of some moved
> files don't work.
>
> * subversion/tests/cmdline/svntest/sandbox.py
> (simple_update): Add optional revision parameter.
>
> * subversion/tests/cmdline/update_tests.py
> (update_move_text_mod update_nested_move_text_mod): New XFAIL tests.
> (test_list): Add new tests.
>
> Modified:
> subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
> subversion/trunk/subversion/tests/cmdline/update_tests.py
>
> Modified: subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnte
> st/sandbox.py?rev=1301390&r1=1301389&r2=1301390&view=diff
> =================================================================
> =============
> --- subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py Fri Mar 16
> 09:29:49 2012
> @@ -200,14 +200,14 @@ class Sandbox:
> temporary and 'TEMP' or 'PERM',
> parts[1])
>
> - def simple_update(self, target=None):
> + def simple_update(self, target=None, revision='HEAD'):
> """Update the WC or TARGET.
> TARGET is a relpath relative to the WC."""
> if target is None:
> target = self.wc_dir
> else:
> target = self.ospath(target)
> - svntest.main.run_svn(False, 'update', target)
> + svntest.main.run_svn(False, 'update', target, '-r', revision)

Note that this change the behavior when target is something like URL_at_123, as svn's -r argument would then default to r123 and not to HEAD.

Maybe you should test if the revision is actually passed instead.

        Bert
Received on 2012-03-16 11:19:36 CET

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