diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2014-02-20 19:26:10 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2014-02-20 19:26:10 +0000 |
| commit | 219f5ebf8fca3572d8d4265d78d0e4670ca35a27 (patch) | |
| tree | e6232088e2faabbf0f1a6e568df3285323f27c5c /subversion/libsvn_fs_fs/fs_fs.c | |
| parent | eeb88685bfa4ef1c0639f1136d83ff19de1b4595 (diff) | |
Notes
Diffstat (limited to 'subversion/libsvn_fs_fs/fs_fs.c')
| -rw-r--r-- | subversion/libsvn_fs_fs/fs_fs.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/subversion/libsvn_fs_fs/fs_fs.c b/subversion/libsvn_fs_fs/fs_fs.c index 101e417eb28f..372455d2d735 100644 --- a/subversion/libsvn_fs_fs/fs_fs.c +++ b/subversion/libsvn_fs_fs/fs_fs.c @@ -5380,11 +5380,13 @@ svn_fs_fs__get_file_delta_stream(svn_txdelta_stream_t **stream_p, /* Read target's base rep if any. */ SVN_ERR(create_rep_state(&rep_state, &rep_args, NULL, NULL, target->data_rep, fs, pool)); - /* If that matches source, then use this delta as is. */ + + /* If that matches source, then use this delta as is. + Note that we want an actual delta here. E.g. a self-delta would + not be good enough. */ if (rep_args->is_delta - && (rep_args->is_delta_vs_empty - || (rep_args->base_revision == source->data_rep->revision - && rep_args->base_offset == source->data_rep->offset))) + && rep_args->base_revision == source->data_rep->revision + && rep_args->base_offset == source->data_rep->offset) { /* Create the delta read baton. */ struct delta_read_baton *drb = apr_pcalloc(pool, sizeof(*drb)); |