63 lines
2.8 KiB
XML
Executable File
63 lines
2.8 KiB
XML
Executable File
<?xml version='1.0'?>
|
|
<!--
|
|
File: %RS_TOOLSCONFIG%/automation/IntegratorMonitoring.xml
|
|
|
|
Author: Derek Ward <derek.ward@rockstarnorth.com>
|
|
Date: 09 May 2013
|
|
|
|
|
|
RESOLVE FLAGS
|
|
|
|
'p4 help resolve'
|
|
|
|
The -a flag puts 'p4 resolve' into automatic mode. The user is not
|
|
prompted, and files that can't be resolved automatically are skipped:
|
|
|
|
-as 'Safe' resolve; skip files that need merging.
|
|
-am Resolve by merging; skip files with conflicts.
|
|
-af Force acceptance of merged files with conflicts.
|
|
-at Force acceptance of theirs; overwrites yours.
|
|
-ay Force acceptance of yours; ignores theirs.
|
|
|
|
-->
|
|
<integrations>
|
|
|
|
<!-- psc integration : Setup for ng, this may change as will the branch spec name etc. -->
|
|
<Integration BranchSpec = "psc_to_assets_metadata_definitions" P4ResolveOptions = "-at"/>
|
|
|
|
<!-- gta5_ng_to_japanese_ng branchspec see url:bugstar:1841854 -->
|
|
<Integration BranchSpec = "gta5_ng_to_japanese_ng" P4ResolveOptions = "-at"/>
|
|
|
|
<!-- gta5_dlc_mpPatchesNG_assets_to_mpPatchesNG_assets_japanese_ng branchspec see url:bugstar:2164743 -->
|
|
<Integration BranchSpec = "gta5_dlc_mpPatchesNG_assets_to_mpPatchesNG_assets_japanese_ng" P4ResolveOptions = "-am"/>
|
|
|
|
<!-- requested by Neil -->
|
|
<Integration BranchSpec = "dev_ng_live_to_dev_ng" P4ResolveOptions = "-am"/>
|
|
|
|
<!-- Requested by Gordon, identified by Graham Rust -->
|
|
<Integration BranchSpec = "dev_ng_Live_to_Japanese_ng_Live" P4ResolveOptions = "-am"/>
|
|
|
|
<!-- gta5_dev_gen9_sga_live_to_dev_gen9_sga and gta5_dev_gen9_sga_to_Japanese_gen9_sga branchspec see url:bugstar:7091179 -->
|
|
<Integration BranchSpec = "gta5_dev_gen9_sga_to_Japanese_gen9_sga" P4ResolveOptions = "-am"/>
|
|
|
|
<!-- gta5_dev_ng to_dev_gen9_sga dev_ng to dev_gen9_sga requested by Neil Walker -->
|
|
<Integration BranchSpec = "gta5_dev_ng_to_dev_gen9_sga" P4ResolveOptions = "-am -dw"/>
|
|
|
|
<!-- gta5_gen9_tu_to_gen9_build_shadersrequested by Mike Waltman -->
|
|
<Integration BranchSpec = "gta5_gen9_tu_to_gen9_build_shaders" P4ResolveOptions = "-at"/>
|
|
<Integration BranchSpec = "gta5_gen9_tu_to_gen9_build_shaders_live" P4ResolveOptions = "-at"/>
|
|
|
|
<!-- gta5_g9ec_vehicles g9ec vehicles to dev_gen9_sga requested by Neil Walker -->
|
|
<!--<Integration BranchSpec = "gta5_g9ec_vehicles" P4ResolveOptions = "-am"/> disabled at the request of Neil Walker-->
|
|
|
|
<!-- sga live to japanese sga live gta5_dev_gen9_sga_live_to_japanese_gen9_sga_live requested by Neil Walker -->
|
|
<Integration BranchSpec = "gta5_dev_gen9_sga_live_to_japanese_gen9_sga_live" P4ResolveOptions = "-am"/>
|
|
|
|
<!-- Requested by Neil Walker -->
|
|
<Integration BranchSpec = "gta5_dev_ng_live_to_dev_gen9_sga_live" P4ResolveOptions = "-am"/>
|
|
<Integration BranchSpec = "gta5_dev_gen9_sga_live_to_dev_gen9_sga" P4ResolveOptions = "-am"/>
|
|
|
|
|
|
|
|
|
|
</integrations> |