| <!-- author Antoine Levy-Lambert levylambert@tiscali-dsl.de --> |
| <!-- this test demonstrates p4integrate --> |
| <project name="integrate" default= "testintegrate"> |
| <property name="second_client" value="levyant_cygwin_test"/> |
| <property name="second_client_root" value="C:\dev\test"/> |
| <property name="depot_file_spec" value="//depot/foobar"/> |
| <property name="depot_file_spec_2" value="//depot/hello"/> |
| <target name="testintegrate"> |
| <p4change client="${second_client}"/> |
| <property name="change1" value="${p4.change}" /> |
| <p4integrate client="${second_client}" change="${p4.change}" fromfile="${depot_file_spec}" tofile="${depot_file_spec_2}" forceintegrate="true" /> |
| <p4resolve client="${second_client}" view="${depot_file_spec_2}" resolvemode="theirs"/> |
| <p4submit client="${second_client}" change="${p4.change}"/> |
| </target> |
| </project> |
