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