You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/02/21 18:02:28 UTC
svn commit: r1448726 -
/subversion/trunk/subversion/tests/cmdline/update_tests.py
Author: philip
Date: Thu Feb 21 17:02:28 2013
New Revision: 1448726
URL: http://svn.apache.org/r1448726
Log:
Add an XFail test for issue 4111.
* subversion/tests/cmdline/update_tests.py
(update_child_below_add): New test.
(test_list): Add new test.
Modified:
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1448726&r1=1448725&r2=1448726&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Feb 21 17:02:28 2013
@@ -6735,6 +6735,44 @@ def bump_below_tree_conflict(sbox):
None, None, None,
sbox.ospath('A/D/G'))
+@Issues(4111)
+@XFail()
+def update_child_below_add(sbox):
+ "update child below added tree"
+
+ sbox.build(read_only = True)
+ wc_dir = sbox.wc_dir
+
+ sbox.simple_update('A/B', 0)
+
+ # Update skips A/B/E because A/B doesn't have a BASE node.
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A/B/E' : Item(verb='Skipped'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.remove('A/B', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta',
+ 'A/B/F', 'A/B/lambda')
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ None,
+ expected_status,
+ None, None, None,
+ None, None, None,
+ sbox.ospath('A/B/E'))
+
+ # Add working nodes over A/B
+ sbox.simple_mkdir('A/B')
+ sbox.simple_mkdir('A/B/E')
+ sbox.simple_add_text('the new alpha', 'A/B/E/alpha')
+
+ # Update should still skip A/B/E
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ None,
+ expected_status,
+ None, None, None,
+ None, None, None,
+ sbox.ospath('A/B/E'))
#######################################################################
@@ -6822,6 +6860,7 @@ test_list = [ None,
windows_update_backslash,
update_moved_away,
bump_below_tree_conflict,
+ update_child_below_add,
]
if __name__ == '__main__':