Author: julianfoad
Date: Thu Jul 21 10:43:17 2011
New Revision: 1149103
URL: http://svn.apache.org/viewvc?rev=1149103&view=rev
Log:
Simplify some descriptions and fix grammar in comments.
* subversion/libsvn_client/merge.c
(adjust_deleted_subtree_ranges): Simplify descriptions by talking at a
slightly higher level.
(do_directory_merge): Remove an apostrophe.
* subversion/libsvn_client/commit_util.c
(harvest_committables): Remove an apostrophe.
* subversion/libsvn_client/mergeinfo.h
(svn_client__merge_path_dup): Remove an apostrophe.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/mergeinfo.h
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1149103&r1=1149102&r2=1149103&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Thu Jul 21 10:43:17
2011
@@ -587,7 +587,7 @@ harvest_committables(svn_wc_context_t *w
/* Check for the deletion case.
* We delete explicitly deleted nodes (duh!)
* We delete not-present children of copies
- * We delete nodes that directly replace a node in it's ancestor
+ * We delete nodes that directly replace a node in its ancestor
*/
if (is_deleted || is_replaced)
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1149103&r1=1149102&r2=1149103&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jul 21 10:43:17 2011
@@ -2989,11 +2989,10 @@ adjust_deleted_subtree_ranges(svn_client
scratch_pool));
}
- /* Since segment doesn't span older_rev:peg_rev we know
+ /* Intersect CHILD->REMAINING_RANGES with the range where PRIMARY_URL
+ exists. Since segment doesn't span older_rev:peg_rev we know
PRIMARY_URL@peg_rev didn't come into existence until
- segment->range_start + 1. Create a rangelist describing
- range where PRIMARY_URL exists and find the intersection of that
- range and CHILD->REMAINING_RANGELIST. */
+ segment->range_start + 1. */
exists_rangelist = svn_rangelist__initialize(segment->range_start,
peg_rev, TRUE,
scratch_pool);
@@ -3002,11 +3001,8 @@ adjust_deleted_subtree_ranges(svn_client
child->remaining_ranges,
FALSE, scratch_pool));
- /* Create a second rangelist describing the range before
- PRIMARY_URL@peg_rev came into existence and find the intersection of
- that range and PARENT->REMAINING_RANGES. Then merge that rangelist
- with exists_rangelist and store the result in
- CHILD->REMANING_RANGES. */
+ /* Merge into CHILD->REMANING_RANGES the intersection of the range before
+ PRIMARY_URL@peg_rev came into existence and PARENT->REMAINING_RANGES.
*/
non_existent_rangelist = svn_rangelist__initialize(older_rev,
segment->range_start,
TRUE, scratch_pool);
@@ -3014,7 +3010,6 @@ adjust_deleted_subtree_ranges(svn_client
non_existent_rangelist,
parent->remaining_ranges,
FALSE, scratch_pool));
-
SVN_ERR(svn_rangelist_merge(&(child->remaining_ranges),
non_existent_rangelist, scratch_pool));
@@ -8362,7 +8357,7 @@ do_directory_merge(svn_mergeinfo_catalog
/* While END_REV is valid, do the following:
1. Tweak each NOTIFY_B->CHILDREN_WITH_MERGEINFO element so that
- the element's remaing_ranges member has as it's first element
+ the element's remaining_ranges member has as its first element
a range that ends with end_rev.
2. Starting with start_rev, call drive_merge_report_editor()
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.h?rev=1149103&r1=1149102&r2=1149103&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.h Thu Jul 21 10:43:17
2011
@@ -99,7 +99,7 @@ svn_client__merge_path_dup(const svn_cli
the range of the parent's last committed revision to the parent's base
revision (inclusive) or is LOCAL_ABSPATH is a local addition. If asking
for the inherited mergeinfo of an added path (i.e. one with no base
- revision), that path may inherit mergeinfo from it's nearest parent
+ revision), that path may inherit mergeinfo from its nearest parent
with a base revision and explicit mergeinfo.
INHERIT indicates whether explicit, explicit or inherited, or only
