diff options
| author | peter <peter@FreeBSD.org> | 2013-11-11 01:00:29 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-11-11 01:00:29 +0000 |
| commit | 68301b10e52aedbf076b5b08303439d75c192e18 (patch) | |
| tree | c05673887167c7ecd55a62ed72830f5186f453c1 /subversion/libsvn_wc/wc-queries.sql | |
| parent | 3b9f7e96381479fb03ae2c36d490a38718f71083 (diff) | |
| download | FreeBSD-src-68301b10e52aedbf076b5b08303439d75c192e18.zip FreeBSD-src-68301b10e52aedbf076b5b08303439d75c192e18.tar.gz | |
Import svn-1.8.4, which includes fixes for both security and merge
handling.
Diffstat (limited to 'subversion/libsvn_wc/wc-queries.sql')
| -rw-r--r-- | subversion/libsvn_wc/wc-queries.sql | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/libsvn_wc/wc-queries.sql b/subversion/libsvn_wc/wc-queries.sql index d5f7e82..d275a7b 100644 --- a/subversion/libsvn_wc/wc-queries.sql +++ b/subversion/libsvn_wc/wc-queries.sql @@ -1571,7 +1571,7 @@ WHERE wc_id = ?1 AND moved_to IS NOT NULL -- STMT_SELECT_MOVED_OUTSIDE -SELECT local_relpath, moved_to FROM nodes +SELECT local_relpath, moved_to, op_depth FROM nodes WHERE wc_id = ?1 AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2)) AND op_depth >= ?3 |
