You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2010/05/07 02:03:00 UTC
svn commit: r941974 - in /subversion/trunk/subversion: include/svn_wc.h
libsvn_subr/io.c libsvn_wc/adm_ops.c libsvn_wc/node.c libsvn_wc/wc_db.h
tests/cmdline/copy_tests.py tests/cmdline/svntest/wc.py
tests/cmdline/tree_conflict_tests.py
Author: neels
Date: Fri May 7 00:02:59 2010
New Revision: 941974
URL: http://svn.apache.org/viewvc?rev=941974&view=rev
Log:
Some cosmetic changes.
* subversion/include/svn_wc.h
(svn_wc_remove_from_revision_control): typo.
* subversion/libsvn_subr/io.c
(svn_io_sleep_for_timestamps): typo.
* subversion/libsvn_wc/adm_ops.c
(svn_wc_delete4): line wrap.
* subversion/libsvn_wc/node.c
(svn_wc__node_get_copyfrom_info): blank line.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_op_read_tree_conflict): typo.
* subversion/tests/cmdline/copy_tests.py
(mixed_wc_to_url): Add two failure messages.
* subversion/tests/cmdline/svntest/wc.py: typo.
* subversion/tests/cmdline/tree_conflict_tests.py
(force_del_tc_inside): Compress two tweak()s into one.
Modified:
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/wc.py
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=941974&r1=941973&r2=941974&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Fri May 7 00:02:59 2010
@@ -4719,7 +4719,7 @@ svn_wc_remove_from_revision_control(svn_
/**
* Assuming @a local_abspath is under version control or a tree conflict
- * victime and in a state of conflict, then take @a local_abspath *out*
+ * victim and in a state of conflict, then take @a local_abspath *out*
* of this state. If @a resolve_text is TRUE then any text conflict is
* resolved, if @a resolve_tree is TRUE then any tree conflicts are
* resolved. If @a resolve_prop is set to "" all property conflicts are
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=941974&r1=941973&r2=941974&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Fri May 7 00:02:59 2010
@@ -1129,7 +1129,7 @@ svn_io_sleep_for_timestamps(const char *
now = apr_time_now(); /* Extract the time used for the path stat */
if (now >= then)
- return; /* Passing negative values may suspend indefinately (Windows) */
+ return; /* Passing negative values may suspend indefinitely (Windows) */
}
apr_sleep(then - now);
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=941974&r1=941973&r2=941974&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri May 7 00:02:59 2010
@@ -1126,9 +1126,9 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
/* else
### Handle added directory that is deleted in parent_access
(was_deleted=TRUE). The current behavior is to just delete the
- directory with its administrative area inside, which is OK for WC-1.0,
- but when we move to a single database per working copy something
- must unversion the directory. */
+ directory with its administrative area inside, which is OK for
+ WC-1.0, but when we move to a single database per working copy
+ something must unversion the directory. */
}
if (kind != svn_wc__db_kind_dir || !was_add || was_deleted)
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=941974&r1=941973&r2=941974&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Fri May 7 00:02:59 2010
@@ -484,7 +484,6 @@ svn_wc__node_get_copyfrom_info(const cha
scratch_pool)) != 0)
*is_copy_target = TRUE;
}
-
}
else if ((status == svn_wc__db_status_added
|| status == svn_wc__db_status_obstructed_add)
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=941974&r1=941973&r2=941974&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Fri May 7 00:02:59 2010
@@ -1157,7 +1157,7 @@ svn_wc__db_op_read_tree_conflict(
Use SCRATCH_POOL for any temporary allocations.
*/
/* ### can this also record text/prop conflicts? drop "tree"? */
-/* ### dunno if it can, but it definately should be able to. */
+/* ### dunno if it can, but it definitely should be able to. */
/* ### gjs: also ref: db_op_mark_conflict() */
svn_error_t *
svn_wc__db_op_set_tree_conflict(svn_wc__db_t *db,
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=941974&r1=941973&r2=941974&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri May 7 00:02:59 2010
@@ -1764,7 +1764,7 @@ def mixed_wc_to_url(sbox):
'co', Z_url, wc_dir)
if os.path.exists(os.path.join(wc_dir, 'pi')):
- raise svntest.Failure
+ raise svntest.Failure("Path 'pi' exists but should be gone.")
fp = open(os.path.join(wc_dir, 'rho'), 'r')
found_it = 0
@@ -1772,7 +1772,7 @@ def mixed_wc_to_url(sbox):
if re.match("^Second modification to rho.", line):
found_it = 1
if not found_it:
- raise svntest.Failure
+ raise svntest.Failure("The second modification to rho didn't make it.")
#----------------------------------------------------------------------
Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=941974&r1=941973&r2=941974&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Fri May 7 00:02:59 2010
@@ -272,7 +272,7 @@ class State:
between the two states. LABEL will be used in the display. SELF is the
"expected" state, and OTHER is the "actual" state.
- If any changes are detected/diplayed, then SVNTreeUnequal is raised.
+ If any changes are detected/displayed, then SVNTreeUnequal is raised.
"""
norm_self = self.normalize()
norm_other = other.normalize()
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=941974&r1=941973&r2=941974&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Fri May 7 00:02:59 2010
@@ -862,8 +862,8 @@ def force_del_tc_inside(sbox):
# Verify deletion status
# Note: the tree conflicts are still in the status.
expected_status.tweak('A/C', status='D ')
- expected_status.tweak('A/C/dir', status='! ', copied=None, wc_rev=None)
- expected_status.tweak('A/C/file', status='! ', copied=None, wc_rev=None)
+ expected_status.tweak('A/C/dir', 'A/C/file', status='! ', copied=None,
+ wc_rev=None)
run_and_verify_status(wc_dir, expected_status)