subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1628676 - in /subversion/trunk/subversion: libsvn_fs_fs/transaction.c libsvn_fs_x/transaction.c
Date Wed, 01 Oct 2014 11:13:19 GMT
Author: julianfoad
Date: Wed Oct  1 11:13:19 2014
New Revision: 1628676

URL: http://svn.apache.org/r1628676
Log:
Tweak comments.

* subversion/libsvn_fs_fs/transaction.c,
  subversion/libsvn_fs_x/transaction.c
  (replace_change): Remove a comment, wrongly duplicated in r1525419.
  (fold_change): Revert a comment, missed in reverting r1525419 in r1597989.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/transaction.c
    subversion/trunk/subversion/libsvn_fs_x/transaction.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1628676&r1=1628675&r2=1628676&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Wed Oct  1 11:13:19 2014
@@ -629,8 +629,6 @@ replace_change(svn_fs_path_change2_t *ol
                const svn_fs_path_change2_t *new_change,
                apr_pool_t *pool)
 {
-  /* An add at this point must be following a previous delete,
-      so treat it just like a replace. */
   old_change->node_kind = new_change->node_kind;
   old_change->node_rev_id = svn_fs_fs__id_copy(new_change->node_rev_id,
                                                pool);
@@ -686,7 +684,7 @@ fold_change(apr_hash_t *changed_paths,
            _("Invalid change ordering: new node revision ID "
              "without delete"));
 
-      /* Sanity check: an add, replacement, move, or reset must be the first
+      /* Sanity check: an add, replacement, or reset must be the first
          thing to follow a deletion. */
       if ((old_change->change_kind == svn_fs_path_change_delete)
           && (! ((info->change_kind == svn_fs_path_change_replace)

Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1628676&r1=1628675&r2=1628676&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Wed Oct  1 11:13:19 2014
@@ -921,7 +921,7 @@ fold_change(apr_hash_t *changes,
            _("Invalid change ordering: new node revision ID "
              "without delete"));
 
-      /* Sanity check: an add, replacement, move, or reset must be the first
+      /* Sanity check: an add, replacement, or reset must be the first
          thing to follow a deletion. */
       if ((old_change->change_kind == svn_fs_path_change_delete)
           && (! ((info->change_kind == svn_fs_path_change_replace)



Mime
View raw message