On Tue, Apr 29, 2008 at 10:33 PM, <hwright_at_tigris.org> wrote:
> Author: hwright
> Date: Tue Apr 29 19:33:44 2008
> New Revision: 30858
>
> Log:
> Merge r30761, r30762 from trunk:
>
> * r30761, r30762
> Fix for issue 3172.
> Notes: 'log -g' fails the moment it encounters a bogus mergeinfo which
> claims a merge from a non-existentpath_at_REV1-REV2.
> Votes:
> +1: kameshj, arfrever, hwright
>
> Modified:
> branches/1.5.x/ (props changed)
> branches/1.5.x/CHANGES (props changed)
> branches/1.5.x/STATUS
> branches/1.5.x/subversion/libsvn_repos/log.c
> branches/1.5.x/subversion/tests/cmdline/log_tests.py
>
> Merged:
> /trunk:r30761-30762
>
<snip>
> Modified: branches/1.5.x/subversion/tests/cmdline/log_tests.py
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/subversion/tests/cmdline/log_tests.py?pathrev=30858&r1=30857&r2=30858
> ==============================================================================
> --- branches/1.5.x/subversion/tests/cmdline/log_tests.py Tue Apr 29 19:23:24 2008 (r30857)
> +++ branches/1.5.x/subversion/tests/cmdline/log_tests.py Tue Apr 29 19:33:44 2008 (r30858)
> @@ -24,6 +24,7 @@ import svntest
> from svntest import wc
>
> from svntest.main import server_has_mergeinfo
> +from svntest.main import SVN_PROP_MERGEINFO
>
> ######################################################################
> #
> @@ -1350,6 +1351,24 @@ def log_xml_with_bad_data(sbox):
> svntest.actions.run_and_verify_log_xml(
> expected_revprops=(r0_props,), args=[sbox.repo_url])
>
> +def merge_sensitive_log_target_with_bogus_mergeinfo(sbox):
> + "'svn log -g target_with_bogus_mergeinfo'"
> + #Refer issue 3172 for details.
> + #Create greek tree
> + #svn ps 'svn:mergeinfo' '/A/B:0' A/D
> + #svn ci -m 'setting bogus mergeinfo'
> + #svn log -g -r2
> + sbox.build()
> + wc_path = sbox.wc_dir
> + D_path = os.path.join(wc_path, 'A', 'D')
> + svntest.main.run_svn(None, 'ps', SVN_PROP_MERGEINFO, '/A/B:0', D_path)
> + #commit at r2
> + svntest.main.run_svn(None, 'ci', '-m', 'setting bogus mergeinfo', D_path)
> + exit_code, output, err = svntest.actions.run_and_verify_svn(None, None,
> + [], 'log',
> + '-g', D_path)
This test fails on 1.5.x because it relies on Jeremy Hinds/Julian
Foad's r29753 which allows testing of application exit codes. We can
simply remove the "exit_code, " portion on 1.5.x...any objections to
that?
Paul
> + if len(err):
> + raise svntest.Failure("svn log -g target_with_bogus_mergeinfo fails")
>
> ########################################################################
> # Run the tests
> @@ -1386,6 +1405,8 @@ test_list = [ None,
> only_one_wc_path,
> retrieve_revprops,
> log_xml_with_bad_data,
> + SkipUnless(merge_sensitive_log_target_with_bogus_mergeinfo,
> + server_has_mergeinfo),
> ]
>
> if __name__ == '__main__':
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-01 23:16:01 CEST