Hi,

I'm having problems re-integrating after performing a branch.

Version 29 of 'myfile' was the current (but unreleased) main codeline version, but the customer was using version 28 in production. Version 29 made substantial functionality changes that would require a lot of user acceptance testing. The customer wanted additional functionality, using version 28 as the basis.

I performed a filespec branch of 'my file' from version 28 of the main codeline and made the required changes to this branched file, which is now at version 1 (from 28).

The customer is now happy to start testing the functionality originally found in 29, but also want the branched changes included.

If I integrate the branch back into the main codeline and resolve I only seem to get the option to keep 29 as it is and loose all the branch changes.

If I integrate the base 29 with the branch and resolve, I get more control over what is to be merged but the target is going to be in the branch and not back in the main codeline.

What am I doing wrong?

Andy P.S I'm using P4Win - when I say 'integrate filex' I mean that I've selected 'filex' from the explorer and then right-clicked 'Integrate, using Filespec'.

Unless expressly stated to the contrary, the views expressed in this email are not necessarily the views of National Grid Transco plc or any of its subsidiaries or affiliates (Group Companies), and the Group Companies, their directors, officers and employees make no representation and accept no liability for its accuracy or completeness.

This e-mail, and any attachments are strictly confidential and intended for the addressee(s) only. The content may also contain legal, professional or other privileged information. If you are not the intended recipient, please notify the sender immediately and then delete the e-mail and any attachments. You should not disclose, copy or take any action in reliance on this transmission. You may report the matter by calling us on + 44(0) 1509 282 501.

Please ensure you have adequate virus protection before you open or detach any documents from this transmission. The Group Companies do not accept any liability for viruses.

An e-mail reply to this address may be subject to monitoring for operational reasons or lawful business practices.