You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/11/23 13:50:47 UTC
svn commit: r1038089 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: julianfoad
Date: Tue Nov 23 12:50:46 2010
New Revision: 1038089
URL: http://svn.apache.org/viewvc?rev=1038089&view=rev
Log:
Spelling.
* subversion/libsvn_client/merge.c
(log_find_operative_revs, find_unsynced_ranges): s/effect/affect/.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1038089&r1=1038088&r2=1038089&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Nov 23 12:50:46 2010
@@ -9665,9 +9665,9 @@ log_find_operative_revs(void *baton,
of the unmerged revisions in UNMERGED_CATALOG's mergeinfos are "phantoms",
that is, one of the following conditions holds:
- 1) The revision effects no corresponding paths in SOURCE_REPOS_REL_PATH.
+ 1) The revision affects no corresponding paths in SOURCE_REPOS_REL_PATH.
- 2) The revision effects corresponding paths in SOURCE_REPOS_REL_PATH,
+ 2) The revision affects corresponding paths in SOURCE_REPOS_REL_PATH,
but based on the mergeinfo in MERGED_CATALOG, the change was
previously merged.
@@ -9718,7 +9718,7 @@ find_unsynced_ranges(const char *source_
}
}
- /* Find any unmerged revisions which both effect the source and
+ /* Find any unmerged revisions which both affect the source and
are not yet merged to it. */
if (potentially_unmerged_ranges)
{