equal
deleted
inserted
replaced
|
1 0. Do MNT CHECK and 'revert unchanged files'. |
|
2 1. Integrate using WSERV clinet and DEV to Main Branch |
|
3 (Branch: DougF_Dev_Main). |
|
4 2. Resolve all the files that are safe: p4 resolve -as |
|
5 3. Accept theres for all MSVC files: p4 resolve -at *.dsp |
|
6 (p4 resolve -at //epoc/.../*.cmd) |
|
7 4. Merge interactives other files |
|
8 5. Make the change list numbered by doing: p4 change |
|
9 (or New Change list from GUI) |
|
10 6. Record number |
|
11 7. Create diff info by doing: |
|
12 p4 change -o nnnnn > diff.lis |
|
13 p4 diff -du >> diff.lis |
|
14 Remove the differences on the make files from the log |
|
15 8. Email the difference listing change list number and argument as to |
|
16 why you won't break things to the build co-ordinator. |
|
17 9. When he approves submit your changes doing: p4 submit -c nnnnn |