Changeset 38108
- Timestamp:
- Apr 10, 2015, 4:05:42 PM (11 years ago)
- Location:
- tags/ipp-pv3-20140717/ippTools/share
- Files:
-
- 2 edited
-
Makefile.am (modified) (2 diffs, 1 prop)
-
remotetool_definebyquery_diff.sql (modified) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-pv3-20140717/ippTools/share/Makefile.am
- Property svn:mergeinfo set to
r37544 r38108 485 485 releasetool_definerelstack_with_skycal.sql \ 486 486 releasetool_listrelstack.sql \ 487 releasetool_setrelstackcalibratedfromskycal.sql \ 487 488 releasetool_summary.sql \ 488 489 releasetool_definerelgroup_select_lap.sql \ … … 509 510 remotetool_definebyquery_stack.sql \ 510 511 remotetool_definebyquery_staticsky.sql \ 512 remotetool_definebyquery_diff.sql \ 511 513 remotetool_dropcomponent.sql \ 512 514 remotetool_listcomponent.sql \ -
tags/ipp-pv3-20140717/ippTools/share/remotetool_definebyquery_diff.sql
-
Property svn:mergeinfo
set to (toggle deleted branches)
/trunk/ippTools/share/remotetool_definebyquery_diff.sql merged eligible /branches/eam_branches/ipp-20140423/ippTools/share/remotetool_definebyquery_diff.sql 36693-36832 /branches/eam_branches/ipp-20140610/ippTools/share/remotetool_definebyquery_diff.sql 36845-37030 /branches/eam_branches/ipp-ops-20130712/ippTools/share/remotetool_definebyquery_diff.sql 37064-37069 /tags/ipp-20130712/ippTools/share/remotetool_definebyquery_diff.sql 35815-37063
r38103 r38108 1 SELECT stage_id FROM 2 3 ( SELECT diff_id AS stage_id 4 FROM diffRun 5 WHERE 6 diffRun.state = 'new' 7 -- where hook %s 8 GROUP BY diff_id 9 ) AS W 10 11 LEFT JOIN 12 13 (SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state 14 FROM remoteRun 15 JOIN remoteComponent USING(remote_id) 16 WHERE 17 remoteRun.stage = 'staticsky' AND remoteComponent.state != 'retry' 18 -- where hook %s 19 ) AS R 20 USING(stage_id) 21 WHERE R.remote_id IS NULL -
Property svn:mergeinfo
set to (toggle deleted branches)
Note:
See TracChangeset
for help on using the changeset viewer.
