From 6573976d8d3ffbe3d00487ebc8c11e3eb4033f17 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 11 Nov 2013 01:00:29 +0000 Subject: Import svn-1.8.4, which includes fixes for both security and merge handling. --- subversion/libsvn_wc/wc_db.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'subversion/libsvn_wc/wc_db.h') diff --git a/subversion/libsvn_wc/wc_db.h b/subversion/libsvn_wc/wc_db.h index 88e455fb51dfe..61906e3cb64f2 100644 --- a/subversion/libsvn_wc/wc_db.h +++ b/subversion/libsvn_wc/wc_db.h @@ -3382,7 +3382,14 @@ svn_wc__db_resolve_delete_raise_moved_away(svn_wc__db_t *db, apr_pool_t *scratch_pool); /* Like svn_wc__db_resolve_delete_raise_moved_away this should be - combined. */ + combined. + + ### LOCAL_ABSPATH specifies the move origin, but the move origin + ### is not necessary unique enough. This function needs an op_root_abspath + ### argument to differentiate between different origins. + + ### See move_tests.py: move_many_update_delete for an example case. + */ svn_error_t * svn_wc__db_resolve_break_moved_away(svn_wc__db_t *db, const char *local_abspath, -- cgit v1.2.3