Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1640481 - in /subversion/branches/1.8.x: ./ STATUS
 subversion/libsvn_fs_fs/fs_fs.c
Date: Wed, 19 Nov 2014 04:00:44 -0000
To: commits@subversion.apache.org
From: svn-role@apache.org
Message-Id: <20141119040044.B5C872388B3A@eris.apache.org>

Author: svn-role
Date: Wed Nov 19 04:00:44 2014
New Revision: 1640481

URL: http://svn.apache.org/r1640481
Log:
Merge the 1.8.x-r1561426 branch:

 * r1561426
   In FSFS, skip the generation of uniquifiers if rep-shared is not supported.
   Branch: ^/subversion/branches/1.8.x-r1561426
   Justification:
     This is not known to be a bug, atm, as we omit these when we write the
     final revisions.  But we rely on those uniquifiers to be NULL in old
     repo formats when we compare reps.  Them being non-NULL in a txn might
     cause problems with future changes.
   Votes:
     +1: stefan2, breser, rhuijben

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1561426
  Merged /subversion/branches/1.8.x-r1561426:r1561547-1640480

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1640481&r1=1640480&r2=1640481&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Nov 19 04:00:44 2014
@@ -206,17 +206,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1561426
-   In FSFS, skip the generation of uniquifiers if rep-shared is not supported.
-   Branch: ^/subversion/branches/1.8.x-r1561426
-   Justification:
-     This is not known to be a bug, atm, as we omit these when we write the
-     final revisions.  But we rely on those uniquifiers to be NULL in old
-     repo formats when we compare reps.  Them being non-NULL in a txn might
-     cause problems with future changes.
-   Votes:
-     +1: stefan2, breser, rhuijben
-
  * r1636874
    Provide @since information in svn_stream_skip docstring.
    Justification:

Modified: subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1640481&r1=1640480&r2=1640481&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c Wed Nov 19 04:00:44 2014
@@ -6966,8 +6966,13 @@ svn_fs_fs__set_entry(svn_fs_t *fs,
       rep = apr_pcalloc(pool, sizeof(*rep));
       rep->revision = SVN_INVALID_REVNUM;
       rep->txn_id = txn_id;
-      SVN_ERR(get_new_txn_node_id(&unique_suffix, fs, txn_id, pool));
-      rep->uniquifier = apr_psprintf(pool, "%s/%s", txn_id, unique_suffix);
+
+      if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
+        {
+          SVN_ERR(get_new_txn_node_id(&unique_suffix, fs, txn_id, pool));
+          rep->uniquifier = apr_psprintf(pool, "%s/%s", txn_id, unique_suffix);
+        }
+
       parent_noderev->data_rep = rep;
       SVN_ERR(svn_fs_fs__put_node_revision(fs, parent_noderev->id,
                                            parent_noderev, FALSE, pool));
@@ -7551,6 +7556,7 @@ rep_write_contents_close(void *baton)
   representation_t *rep;
   representation_t *old_rep;
   apr_off_t offset;
+  fs_fs_data_t *ffd = b->fs->fsap_data;
 
   rep = apr_pcalloc(b->parent_pool, sizeof(*rep));
   rep->offset = b->rep_offset;
@@ -7567,9 +7573,13 @@ rep_write_contents_close(void *baton)
   /* Fill in the rest of the representation field. */
   rep->expanded_size = b->rep_size;
   rep->txn_id = svn_fs_fs__id_txn_id(b->noderev->id);
-  SVN_ERR(get_new_txn_node_id(&unique_suffix, b->fs, rep->txn_id, b->pool));
-  rep->uniquifier = apr_psprintf(b->parent_pool, "%s/%s", rep->txn_id,
-                                 unique_suffix);
+
+  if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
+    {
+      SVN_ERR(get_new_txn_node_id(&unique_suffix, b->fs, rep->txn_id, b->pool));
+      rep->uniquifier = apr_psprintf(b->parent_pool, "%s/%s", rep->txn_id,
+                                     unique_suffix);
+    }
   rep->revision = SVN_INVALID_REVNUM;
 
   /* Finalize the checksum. */