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 2010/09/01 18:46:11 UTC
svn commit: r991599 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: philip
Date: Wed Sep 1 16:46:10 2010
New Revision: 991599
URL: http://svn.apache.org/viewvc?rev=991599&view=rev
Log:
Fix merge_tests 29. When merge adds a directory its children no longer
show as status 'A', and so when committing such a directory the children
are no longer explicitly added.
* subversion/tests/cmdline/merge_tests.py
(merge_dir_replace): Adjust expected outputs.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=991599&r1=991598&r2=991599&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Sep 1 16:46:10 2010
@@ -2457,11 +2457,11 @@ def merge_dir_replace(sbox):
expected_status = wc.State(C_path, {
'' : Item(status=' M', wc_rev=3),
'foo' : Item(status='R ', wc_rev='-', copied='+'),
- 'foo/new file 2' : Item(status='D ', wc_rev='-', copied='+'),
- 'foo/file foo' : Item(status='A ', wc_rev='-', copied='+'),
- 'foo/bar' : Item(status='A ', wc_rev='-', copied='+'),
- 'foo/bar/new file 3' : Item(status='A ', wc_rev='-', copied='+'),
- 'foo/new file' : Item(status='D ', wc_rev='-', copied='+'),
+ 'foo/new file 2' : Item(status='D ', wc_rev='3'),
+ 'foo/file foo' : Item(status=' ', wc_rev='-', copied='+'),
+ 'foo/bar' : Item(status=' ', wc_rev='-', copied='+'),
+ 'foo/bar/new file 3' : Item(status=' ', wc_rev='-', copied='+'),
+ 'foo/new file' : Item(status='D ', wc_rev='3'),
})
expected_skip = wc.State(C_path, { })
svntest.actions.run_and_verify_merge(C_path, '2', '5', F_url, None,
@@ -2480,9 +2480,6 @@ def merge_dir_replace(sbox):
expected_output = svntest.wc.State(wc_dir, {
'A/C' : Item(verb='Sending'),
'A/C/foo' : Item(verb='Replacing'),
- 'A/C/foo/file foo' : Item(verb='Adding'),
- 'A/C/foo/bar' : Item(verb='Adding'),
- 'A/C/foo/bar/new file 3' : Item(verb='Adding'),
})
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
@@ -15952,8 +15949,8 @@ test_list = [ None,
SkipUnless(cherry_pick_text_conflict,
server_has_mergeinfo),
merge_file_replace,
- XFail(SkipUnless(merge_dir_replace,
- server_has_mergeinfo)),
+ SkipUnless(merge_dir_replace,
+ server_has_mergeinfo),
merge_dir_and_file_replace,
merge_file_replace_to_mixed_rev_wc,
SkipUnless(merge_ignore_whitespace,