diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
| commit | 3faf8d6bffc5d0fb2525ba37bb504c53366caf9d (patch) | |
| tree | 7e47911263e75034b767fe34b2f8d3d17e91f66d /subversion/libsvn_wc/crop.c | |
| parent | a55fb3c0d5eca7d887798125d5b95942b1f01d4b (diff) | |
Diffstat (limited to 'subversion/libsvn_wc/crop.c')
| -rw-r--r-- | subversion/libsvn_wc/crop.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/subversion/libsvn_wc/crop.c b/subversion/libsvn_wc/crop.c index 3a46b42d4be26..51f130aa26203 100644 --- a/subversion/libsvn_wc/crop.c +++ b/subversion/libsvn_wc/crop.c @@ -106,7 +106,12 @@ crop_children(svn_wc__db_t *db, svn_boolean_t modified, all_deletes; if (child_status != svn_wc__db_status_deleted) - continue; /* Leave local additions alone */ + { + /* ### TODO: Check for issue #4636 constraints, but not only on + this node, but also at all its descendants: We don't want + to remove moved_from information here! */ + continue; /* Leave local additions alone */ + } SVN_ERR(svn_wc__node_has_local_mods(&modified, &all_deletes, db, child_abspath, FALSE, |