You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/09 18:13:31 UTC
svn commit: r920986 [2/2] - in /subversion/trunk: build/generator/
subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/javahl/src/org/tigris/subversion/javahl/
subversion/bindings/javahl/t...
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Tue Mar 9 17:13:29 2010
@@ -4332,37 +4332,37 @@ def tree_conflicts_on_update_1_1(sbox):
expected_info = {
'F/alpha' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .file.*/F/alpha@3$',
},
'DF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .dir.*/DF/D1@3$',
},
'DDF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .dir.*/DDF/D1@3$',
},
'D/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .dir.*/D/D1@3$',
},
'DD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .dir.*/DD/D1@3$',
},
'DDD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .dir.*/DDD/D1@3$',
@@ -4416,7 +4416,7 @@ def tree_conflicts_on_update_1_2(sbox):
'DDD/D1/D2/D3',
'DDF/D1/D2/gamma',
'DF/D1/beta')
-
+
### Why does the deep trees state not include files?
expected_disk.remove('D/D1',
'DD/D1/D2',
@@ -4424,37 +4424,37 @@ def tree_conflicts_on_update_1_2(sbox):
expected_info = {
'F/alpha' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .none.*/F/alpha@3$',
},
'DF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .dir.*/DF/D1@3$',
},
'DDF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .dir.*/DDF/D1@3$',
},
'D/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .none.*/D/D1@3$',
},
'DD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .dir.*/DD/D1@3$',
},
'DDD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming edit upon update'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .dir.*/DDD/D1@3$',
@@ -4507,37 +4507,37 @@ def tree_conflicts_on_update_2_1(sbox):
expected_info = {
'F/alpha' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local edit, incoming delete upon update'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .none.*/F/alpha@3$',
},
'DF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local edit, incoming delete upon update'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .none.*/DF/D1@3$',
},
'DDF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local edit, incoming delete upon update'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .none.*/DDF/D1@3$',
},
'D/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local edit, incoming delete upon update'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .none.*/D/D1@3$',
},
'DD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local edit, incoming delete upon update'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .none.*/DD/D1@3$',
},
'DDD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local edit, incoming delete upon update'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .none.*/DDD/D1@3$',
@@ -4610,37 +4610,37 @@ def tree_conflicts_on_update_2_2(sbox):
expected_info = {
'F/alpha' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .none.*/F/alpha@3$',
},
'DF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .none.*/DF/D1@3$',
},
'DDF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .none.*/DDF/D1@3$',
},
'D/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .none.*/D/D1@3$',
},
'DD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .none.*/DD/D1@3$',
},
'DDD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .none.*/DDD/D1@3$',
@@ -4771,37 +4771,37 @@ def tree_conflicts_on_update_3(sbox):
expected_info = {
'F/alpha' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .file.*/F/alpha@2'
+ ' Source right: .none.*/F/alpha@3$',
},
'DF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/DF/D1@2'
+ ' Source right: .none.*/DF/D1@3$',
},
'DDF/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/DDF/D1@2'
+ ' Source right: .none.*/DDF/D1@3$',
},
'D/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/D/D1@2'
+ ' Source right: .none.*/D/D1@3$',
},
'DD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/DD/D1@2'
+ ' Source right: .none.*/DD/D1@3$',
},
'DDD/D1' : {
- 'Tree conflict' :
+ 'Tree conflict' :
'^local delete, incoming delete upon update'
+ ' Source left: .dir.*/DDD/D1@2'
+ ' Source right: .none.*/DDD/D1@3$',
@@ -5218,21 +5218,21 @@ def set_deep_depth_on_target_with_shallo
'A/D/H/omega' : Item(status='D '),
'A/D/H/psi' : Item(status='D '),
})
-
+
expected_status.remove('A/D/G/pi',
'A/D/G/rho',
'A/D/G/tau',
'A/D/H/chi',
'A/D/H/omega',
'A/D/H/psi')
-
+
expected_disk.remove('A/D/G/pi',
'A/D/G/rho',
'A/D/G/tau',
'A/D/H/chi',
'A/D/H/omega',
'A/D/H/psi')
-
+
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
@@ -5257,11 +5257,11 @@ def set_deep_depth_on_target_with_shallo
'A/D/H/omega' : Item(status='A '),
'A/D/H/psi' : Item(status='A '),
})
-
+
expected_disk = svntest.main.greek_state.copy()
-
+
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
-
+
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
@@ -5311,7 +5311,7 @@ def update_deleted_locked_files(sbox):
svntest.main.run_svn(None, 'delete', E)#iota, E)
expected_output = svntest.wc.State(wc_dir, {})
-
+
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('iota',
'A/B/E/alpha',
@@ -5392,7 +5392,7 @@ def update_empty_hides_entries(sbox):
wc_dir)
# Now update the rest back to head
-
+
# This operation is currently a NO-OP, because the WC-Crawler
# tells the repository that it contains a full tree of the HEAD
# revision.
@@ -5448,7 +5448,7 @@ def mergeinfo_updates_merge_with_local_m
sbox.repo_url + '/A', A_COPY_path)
svntest.actions.run_and_verify_svn(None, [A_COPY_path + " - /A:3\n"], [],
'pg', SVN_PROP_MERGEINFO, '-R',
- A_COPY_path)
+ A_COPY_path)
# Update the WC (to r8), the mergeinfo on A_COPY should now have both
# the local mod from the uncommitted merge (/A:3* --> /A:3) and the change
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Tue Mar 9 17:13:29 2010
@@ -143,7 +143,7 @@ def basic_upgrade(sbox):
def upgrade_with_externals(sbox):
"upgrade with externals"
-
+
# Create wc from tarfile, uses the same structure of the wc as the tests
# in externals_tests.py.
replace_sbox_with_tarfile(sbox, 'upgrade_with_externals.tar.bz2')
@@ -279,8 +279,8 @@ def basic_upgrade_1_0(sbox):
# Now check the contents of the working copy
# #### This working copy is not just a basic tree,
# fix with the right data once we get here
- expected_status = svntest.wc.State(sbox.wc_dir,
- {
+ expected_status = svntest.wc.State(sbox.wc_dir,
+ {
'' : Item(status=' ', wc_rev=7),
'B' : Item(status=' ', wc_rev='7'),
'B/mu' : Item(status=' ', wc_rev='7'),
Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Tue Mar 9 17:13:29 2010
@@ -380,7 +380,7 @@ get_set_revprop_packed_fs(const svn_test
/* Try to get revprop for revision 0. */
SVN_ERR(svn_fs_revision_prop(&prop_value, fs, 0, SVN_PROP_REVISION_AUTHOR, pool));
-
+
/* Try to change revprop for revision 0. */
SVN_ERR(svn_fs_change_rev_prop(fs, 0, SVN_PROP_REVISION_AUTHOR,
svn_string_create("tweaked-author", pool), pool));
Modified: subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Tue Mar 9 17:13:29 2010
@@ -159,7 +159,7 @@ static const char * const mergeinfo_path
"/patch-common::netasq-bpf.c",
"/patch-common_netasq-bpf.c:",
"/:patch:common:netasq:bpf.c",
-
+
"/trunk",
"/trunk",
"/trunk",
@@ -1098,7 +1098,7 @@ test_mergeinfo_to_string(apr_pool_t *poo
APR_HASH_KEY_STRING,
apr_hash_get(info1, "/trunk", APR_HASH_KEY_STRING));
SVN_ERR(svn_mergeinfo_to_string(&output, info2, pool));
-
+
if (svn_string_compare(expected, output) != TRUE)
return fail(pool, "Mergeinfo string not what we expected");