subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bert Huijben" <b...@qqmail.nl>
Subject RE: svn commit: r1131109 - /subversion/trunk/subversion/tests/cmdline/stat_tests.py
Date Fri, 03 Jun 2011 17:10:50 GMT


> -----Original Message-----
> From: sbutler@apache.org [mailto:sbutler@apache.org]
> Sent: vrijdag 3 juni 2011 18:57
> To: commits@subversion.apache.org
> Subject: svn commit: r1131109 -
> /subversion/trunk/subversion/tests/cmdline/stat_tests.py
> 
> Author: sbutler
> Date: Fri Jun  3 16:57:22 2011
> New Revision: 1131109
> 
> URL: http://svn.apache.org/viewvc?rev=1131109&view=rev
> Log:
> A test that reveals a problem with 'svn status' in mixed-revision
> copied trees.
> 
> * subversion/tests/cmdline/stat_tests.py
>   (copy_with_mixed_revisions): New XFAIL test.
>   (test_list): Add the test.
> 
> Modified:
>     subversion/trunk/subversion/tests/cmdline/stat_tests.py
> 
> Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/s
> tat_tests.py?rev=1131109&r1=1131108&r2=1131109&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Fri Jun  3
> 16:57:22 2011
> @@ -1884,6 +1884,48 @@ def wc_wc_copy_timestamp(sbox):
> 
>    svntest.actions.run_and_verify_status(wc_dir, expected_output)
> 
> +@XFail()
> +def copy_with_mixed_revisions(sbox):
> +  """copy with mixed revisions"""
> +
> +  # Note: A "local edit, incoming delete upon update" tree conflict
> +  # leads to the same situation.
> +
> +  sbox.build()
> +  wc = sbox.ospath
> +
> +  # Make a change in a tree and commit.
> +  svntest.main.file_append(wc('A/D/G/rho'), "Local edit\n")
> +  sbox.simple_commit() # r2
> +  sbox.simple_update()
> +
> +  # Set up mixed revisions.
> +  svntest.main.run_svn(None, 'up', '-r', 1, wc('A/D/G'))
> +
> +  # Copy the tree into a newly-added directory.
> +  sbox.simple_mkdir('copy-dest')
> +  sbox.simple_copy('A/D', 'copy-dest')
> +
> +  ### As of r1130919 (pre-1.7 trunk): If we expect status '  ' for D/G,
> +  ### the verification via 'svn status -vuq' fails.  If we expect
> +  ### status 'A ', the verification via 'entries-dump' fails.  Which
> +  ### one is right?

It is quite possible that they are both right.

svn_wc_entry_t can't express everything that we can in the NODES layers. Especially with multi
layered replacements the status (which is based on the top one or two layers) can be different
than svn_wc_entry_t (which looks at the lowest and the highest layer and notes tree replacements
as replacement on every node instead of only at the root: the way the old revert base worked).

There are a few more tests where the results differ. For that specific case you can add entry_status
and entry_rev arguments to the test suite.

	Bert 



Mime
View raw message