diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2013-11-11 01:00:29 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2013-11-11 01:00:29 +0000 |
| commit | 6573976d8d3ffbe3d00487ebc8c11e3eb4033f17 (patch) | |
| tree | c05673887167c7ecd55a62ed72830f5186f453c1 /subversion/libsvn_wc/diff_editor.c | |
| parent | 97551b2898eb459e9b616947d87d026d27b61518 (diff) | |
Notes
Diffstat (limited to 'subversion/libsvn_wc/diff_editor.c')
| -rw-r--r-- | subversion/libsvn_wc/diff_editor.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/subversion/libsvn_wc/diff_editor.c b/subversion/libsvn_wc/diff_editor.c index 839241f9db624..b4268843893b7 100644 --- a/subversion/libsvn_wc/diff_editor.c +++ b/subversion/libsvn_wc/diff_editor.c @@ -474,14 +474,18 @@ svn_wc__diff_base_working_diff(svn_wc__db_t *db, { const svn_io_dirent2_t *dirent; + /* Verify truename to mimic status for iota/IOTA difference on Windows */ SVN_ERR(svn_io_stat_dirent2(&dirent, local_abspath, - FALSE /* verify truename */, + TRUE /* verify truename */, TRUE /* ingore_enoent */, scratch_pool, scratch_pool)); - if (dirent->kind == svn_node_file - && dirent->filesize == recorded_size - && dirent->mtime == recorded_time) + /* If a file does not exist on disk (missing/obstructed) then we + can't provide a text diff */ + if (dirent->kind != svn_node_file + || (dirent->kind == svn_node_file + && dirent->filesize == recorded_size + && dirent->mtime == recorded_time)) { files_same = TRUE; } |