diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-04-29 19:16:59 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-04-29 19:16:59 +0000 |
| commit | c94cceea9c2262c5b2ad5f215bb9a8ae48b02764 (patch) | |
| tree | dbb8174cbf6f1cc45b8de8031b18adb4030509a8 /subversion/libsvn_fs_base | |
| parent | dc5d469d6574e9fb03bdd793658bb371315b306a (diff) | |
Notes
Diffstat (limited to 'subversion/libsvn_fs_base')
| -rw-r--r-- | subversion/libsvn_fs_base/dag.c | 10 | ||||
| -rw-r--r-- | subversion/libsvn_fs_base/fs.h | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/subversion/libsvn_fs_base/dag.c b/subversion/libsvn_fs_base/dag.c index e530fb2b4305..7c79dc2018a3 100644 --- a/subversion/libsvn_fs_base/dag.c +++ b/subversion/libsvn_fs_base/dag.c @@ -1657,8 +1657,14 @@ svn_fs_base__things_different(svn_boolean_t *props_changed, /* Compare contents keys and their (optional) uniquifiers. */ if (contents_changed != NULL) - *contents_changed = (! svn_fs_base__same_keys(noderev1->data_key, - noderev2->data_key)); + *contents_changed = + (! (svn_fs_base__same_keys(noderev1->data_key, + noderev2->data_key) + /* Technically, these uniquifiers aren't used and "keys", + but keys are base-36 stringified numbers, so we'll take + this liberty. */ + && (svn_fs_base__same_keys(noderev1->data_key_uniquifier, + noderev2->data_key_uniquifier)))); return SVN_NO_ERROR; } diff --git a/subversion/libsvn_fs_base/fs.h b/subversion/libsvn_fs_base/fs.h index bdbced3ccb49..cc89116836a7 100644 --- a/subversion/libsvn_fs_base/fs.h +++ b/subversion/libsvn_fs_base/fs.h @@ -195,11 +195,7 @@ typedef struct node_revision_t only because one or both of us decided to pick up a shared representation after-the-fact." May be NULL (if this node revision isn't using a shared rep, or isn't the original - "assignee" of a shared rep). - - This is no longer used by the 1.9 code but we have to keep - reading and writing it to remain compatible with 1.8, and - earlier, that require it. */ + "assignee" of a shared rep). */ const char *data_key_uniquifier; /* representation key for this node's text-data-in-progess (files |