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/08/05 16:51:50 UTC
svn commit: r982647 - in /subversion/trunk/subversion/tests/cmdline:
entries-dump.c merge_tests.py
Author: philip
Date: Thu Aug 5 14:51:49 2010
New Revision: 982647
URL: http://svn.apache.org/viewvc?rev=982647&view=rev
Log:
Revert r982634. While it fixes merge_tests.py 16 it causes other
tests to fail.
* subversion/tests/cmdline/entries-dump.c (print_dir): Revert.
* subversion/tests/cmdline/merge_tests.py (merge_into_missing): Revert.
Modified:
subversion/trunk/subversion/tests/cmdline/entries-dump.c
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/entries-dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries-dump.c?rev=982647&r1=982646&r2=982647&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries-dump.c (original)
+++ subversion/trunk/subversion/tests/cmdline/entries-dump.c Thu Aug 5 14:51:49 2010
@@ -155,10 +155,6 @@ print_dir(const char *local_abspath,
if (kind != svn_node_dir)
return SVN_NO_ERROR;
- SVN_ERR(svn_io_check_path(local_abspath, &kind, scratch_pool));
- if (kind != svn_node_dir)
- return SVN_NO_ERROR;
-
printf("%s\n",
svn_dirent_local_style(
svn_dirent_join(bt->prefix_path,
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=982647&r1=982646&r2=982647&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Thu Aug 5 14:51:49 2010
@@ -1715,10 +1715,10 @@ def merge_into_missing(sbox):
'' : Item(status=' ', wc_rev=1),
'foo' : Item(status='! ', wc_rev=2),
'Q' : Item(status='! ', wc_rev='?'),
+# In some intermediate WC-NG state (since r937468) this was:
+# 'Q' : Item(status='! ', wc_rev='2', entry_rev='?'),
+# but the expected value is now back what it was.
})
- if svntest.main.wc_is_singledb(wc_dir):
- # This also applied in some intermediate WC-NG state (since r937468)
- expected_status.tweak('Q', wc_rev=2, entry_rev='?')
expected_skip = wc.State(F_path, {
'Q' : Item(),
'foo' : Item(),
@@ -1740,17 +1740,14 @@ def merge_into_missing(sbox):
'' : Item(status=' M', wc_rev=1),
'foo' : Item(status='!M', wc_rev=2),
'Q' : Item(status='! ', wc_rev='?'),
+# In some intermediate WC-NG state (since r937468) this was:
+# 'Q' : Item(status='! ', wc_rev='2', entry_rev='?'),
+# but the expected value is now back what it was.
})
- if svntest.main.wc_is_singledb(wc_dir):
- # This also applied in some intermediate WC-NG state (since r937468)
- expected_status.tweak('Q', wc_rev=2, entry_rev='?')
expected_mergeinfo_output = wc.State(F_path, {
'' : Item(status=' U'),
'foo' : Item(status=' U'), # Mergeinfo is set on missing/obstructed files.
})
- if svntest.main.wc_is_singledb(wc_dir):
- # mergeinfo is set on missing/obstructed directories as well
- expected_mergeinfo_output.add({'Q' : Item(status=' U')})
svntest.actions.run_and_verify_merge(F_path, '1', '2', F_url, None,
expected_output,
expected_mergeinfo_output,
@@ -1777,10 +1774,10 @@ def merge_into_missing(sbox):
'A/B/F' : Item(status=' M', wc_rev=1),
'A/B/F/foo' : Item(status='!M', wc_rev=2),
'A/B/F/Q' : Item(status='! ', wc_rev='?'),
+# In some intermediate WC-NG state (since r937468) this was:
+# 'A/B/F/Q' : Item(status='! ', wc_rev='2', entry_rev='?'),
+# but the expected value is now back what it was.
})
- if svntest.main.wc_is_singledb(wc_dir):
- # This also applied in some intermediate WC-NG state (since r937468)
- expected_status.tweak('A/B/F/Q', wc_rev=2, entry_rev='?')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
#----------------------------------------------------------------------