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.h | |
| 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.h')
| -rw-r--r-- | subversion/libsvn_wc/wc-queries.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subversion/libsvn_wc/wc-queries.h b/subversion/libsvn_wc/wc-queries.h index 950f625..d864ca3 100644 --- a/subversion/libsvn_wc/wc-queries.h +++ b/subversion/libsvn_wc/wc-queries.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.4/subversion/libsvn_wc/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_SELECT_NODE_INFO 0 @@ -2000,7 +2000,7 @@ #define STMT_SELECT_MOVED_OUTSIDE 191 #define STMT_191_INFO {"STMT_SELECT_MOVED_OUTSIDE", NULL} #define STMT_191 \ - "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 (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ " AND op_depth >= ?3 " \ |
