* subversion/libsvn_wc/wc-queries.sql   (STMT_SELECT_ANY_PRISTINE_REFERENCE, STMT_SELECT_UNREFERENCED_PRISTINES):     Ignore the conflict info in the 'actual_node' table when looking for     references to pristine texts, because the conflict checksum columns are     not yet used and so this was just an extra complication.
* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_ANY_PRISTINE_REFERENCE, STMT_SELECT_UNREFERENCED_PRISTINES):
    Ignore the conflict info in the 'actual_node' table when looking for
    references to pristine texts, because the conflict checksum columns are
    not yet used and so this was just an extra complication.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion