You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by David Glasser <gl...@davidglasser.net> on 2008/04/25 15:41:42 UTC
Re: svn commit: r30776 - trunk/subversion/tests/cmdline
Whoa, this seems rather serious. Are you saying that svndumpfilter,
by default, will be lossy?
--dave
On Fri, Apr 25, 2008 at 5:26 AM, <ka...@tigris.org> wrote:
> Author: kameshj
> Date: Fri Apr 25 05:26:40 2008
> New Revision: 30776
>
> Log:
> Testcase to show issue 3181.
> svndumpfilter drops mergeinfo when it is *not* run with --renumber-revs.
>
> * subversion/tests/cmdline/svndumpfilter_tests.py
> (svndumpfilter_loses_mergeinfo): New function.
> (test_list): Add 'svndumpfilter_loses_mergeinfo' as XFail test.
>
> Found by: MSshu
>
> Modified:
> trunk/subversion/tests/cmdline/svndumpfilter_tests.py
>
> Modified: trunk/subversion/tests/cmdline/svndumpfilter_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?pathrev=30776&r1=30775&r2=30776
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svndumpfilter_tests.py Fri Apr 25 04:19:25 2008 (r30775)
> +++ trunk/subversion/tests/cmdline/svndumpfilter_tests.py Fri Apr 25 05:26:40 2008 (r30776)
> @@ -103,6 +103,32 @@ def reflect_dropped_renumbered_revs(sbox
> [], 'propget', 'svn:mergeinfo', '-R',
> sbox.repo_url + '/branch2')
>
> +def svndumpfilter_loses_mergeinfo(sbox):
> + "svndumpfilter looses mergeinfo"
> + #svndumpfilter looses mergeinfo if invoked without --renumber-revs
> +
> + ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3181. ##
> +
> + test_create(sbox)
> + dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]),
> + 'svndumpfilter_tests_data',
> + 'with_merges.dump')
> + dumpfile = svntest.main.file_read(dumpfile_location)
> +
> + filtered_out = filter_and_return_output(dumpfile, "include",
> + "trunk", "branch1", "--quiet")
> + load_and_verify_dumpstream(sbox, [], [], None, filtered_out)
> +
> + # Verify the svn:mergeinfo properties
> + svntest.actions.run_and_verify_svn(None,
> + [sbox.repo_url+"/trunk - /branch1:4-8\n"],
> + [], 'propget', 'svn:mergeinfo', '-R',
> + sbox.repo_url + '/trunk')
> + svntest.actions.run_and_verify_svn(None,
> + [sbox.repo_url+"/branch1 - /trunk:1-2\n"],
> + [], 'propget', 'svn:mergeinfo', '-R',
> + sbox.repo_url + '/branch1')
> +
>
> ########################################################################
> # Run the tests
> @@ -111,6 +137,7 @@ def reflect_dropped_renumbered_revs(sbox
> # list all tests here, starting with None:
> test_list = [ None,
> reflect_dropped_renumbered_revs,
> + XFail(svndumpfilter_loses_mergeinfo),
> ]
>
> if __name__ == '__main__':
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: svn commit: r30776 - trunk/subversion/tests/cmdline
Posted by Kamesh Jayachandran <ka...@collab.net>.
Yes, It was a regression since our 'mergeinfo renumbering change'.
I first thought it can be very serious.
But later I realized that as of today except we SVN developers, general audience don't have dump with mergeinfo as of today(unless they use svn 1.5).
With regards
Kamesh Jayachandran
-----Original Message-----
From: dglasser@gmail.com on behalf of David Glasser
Sent: Fri 4/25/2008 9:11 PM
To: dev@subversion.tigris.org; kameshj@tigris.org
Cc: svn@subversion.tigris.org
Subject: Re: svn commit: r30776 - trunk/subversion/tests/cmdline
Whoa, this seems rather serious. Are you saying that svndumpfilter,
by default, will be lossy?
--dave
On Fri, Apr 25, 2008 at 5:26 AM, <ka...@tigris.org> wrote:
> Author: kameshj
> Date: Fri Apr 25 05:26:40 2008
> New Revision: 30776
>
> Log:
> Testcase to show issue 3181.
> svndumpfilter drops mergeinfo when it is *not* run with --renumber-revs.
>
> * subversion/tests/cmdline/svndumpfilter_tests.py
> (svndumpfilter_loses_mergeinfo): New function.
> (test_list): Add 'svndumpfilter_loses_mergeinfo' as XFail test.
>
> Found by: MSshu
>
> Modified:
> trunk/subversion/tests/cmdline/svndumpfilter_tests.py
>
> Modified: trunk/subversion/tests/cmdline/svndumpfilter_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?pathrev=30776&r1=30775&r2=30776
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svndumpfilter_tests.py Fri Apr 25 04:19:25 2008 (r30775)
> +++ trunk/subversion/tests/cmdline/svndumpfilter_tests.py Fri Apr 25 05:26:40 2008 (r30776)
> @@ -103,6 +103,32 @@ def reflect_dropped_renumbered_revs(sbox
> [], 'propget', 'svn:mergeinfo', '-R',
> sbox.repo_url + '/branch2')
>
> +def svndumpfilter_loses_mergeinfo(sbox):
> + "svndumpfilter looses mergeinfo"
> + #svndumpfilter looses mergeinfo if invoked without --renumber-revs
> +
> + ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3181. ##
> +
> + test_create(sbox)
> + dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]),
> + 'svndumpfilter_tests_data',
> + 'with_merges.dump')
> + dumpfile = svntest.main.file_read(dumpfile_location)
> +
> + filtered_out = filter_and_return_output(dumpfile, "include",
> + "trunk", "branch1", "--quiet")
> + load_and_verify_dumpstream(sbox, [], [], None, filtered_out)
> +
> + # Verify the svn:mergeinfo properties
> + svntest.actions.run_and_verify_svn(None,
> + [sbox.repo_url+"/trunk - /branch1:4-8\n"],
> + [], 'propget', 'svn:mergeinfo', '-R',
> + sbox.repo_url + '/trunk')
> + svntest.actions.run_and_verify_svn(None,
> + [sbox.repo_url+"/branch1 - /trunk:1-2\n"],
> + [], 'propget', 'svn:mergeinfo', '-R',
> + sbox.repo_url + '/branch1')
> +
>
> ########################################################################
> # Run the tests
> @@ -111,6 +137,7 @@ def reflect_dropped_renumbered_revs(sbox
> # list all tests here, starting with None:
> test_list = [ None,
> reflect_dropped_renumbered_revs,
> + XFail(svndumpfilter_loses_mergeinfo),
> ]
>
> if __name__ == '__main__':
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/