subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From luke1...@apache.org
Subject svn commit: r1764283 - in /subversion/trunk/subversion: libsvn_client/conflicts.c libsvn_wc/entries.c
Date Tue, 11 Oct 2016 16:08:22 GMT
Author: luke1410
Date: Tue Oct 11 16:08:21 2016
New Revision: 1764283

URL: http://svn.apache.org/viewvc?rev=1764283&view=rev
Log:
Correct typos in comments.

* subversion/libsvn_wc/entries.c (write_entry): correct typo
* subversion/libsvn_client/conflicts.c (): correct typo

Obvious fix.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c
    subversion/trunk/subversion/libsvn_wc/entries.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1764283&r1=1764282&r2=1764283&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Oct 11 16:08:21 2016
@@ -70,7 +70,7 @@ struct svn_client_conflict_t
   apr_hash_t *prop_conflicts;
 
   /* Indicate which options were chosen to resolve a text or tree conflict
-   * on the conflited node. */
+   * on the conflicted node. */
   svn_client_conflict_option_id_t resolution_text;
   svn_client_conflict_option_id_t resolution_tree;
 

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1764283&r1=1764282&r2=1764283&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue Oct 11 16:08:21 2016
@@ -2004,7 +2004,7 @@ write_entry(struct write_baton **entry_n
   if (entry_node && entry->tree_conflict_data)
     {
       /* Issues #3840/#3916: 1.6 stores multiple tree conflicts on the
-         parent node, 1.7 stores them directly on the conflited nodes.
+         parent node, 1.7 stores them directly on the conflicted nodes.
          So "((skel1) (skel2))" becomes "(skel1)" and "(skel2)" */
       svn_skel_t *skel;
 



Mime
View raw message