[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Merge branch problem...

From: Paul Smith
Subject: Merge branch problem...
Date: Tue, 11 Dec 2007 20:43:53 -0000

Hi there,
I am trying to merge the changes between 2 tags on a branch into the trunk of my cvs repository.
The situation is that 1or 2 files were created on the trunk after the branch point and they dont exist on the branch.
I am using the Eclipse cvs client and when i do the merge the incoming changes overwrite these files that dont exist on the branch.
It's as though cvs thinks the files have been deleted from the branch most recently.
Is this a known problem and if so if there a way around it? 
Paul Smith

If you are not the intended recipient any unauthorised use, publication, copying or dissemination of this message is strictly prohibited. If you have received this e-mail in error, please return it to the sender immediately and delete it and any attachments from your system. E-mail messages cannot be guaranteed to be complete, secure or error free and Monitise makes no representation nor accepts any responsibility or liability as to the completeness and accuracy of the information contained in this message. Whilst all reasonable care has been taken to avoid the transmission of viruses, it is the responsibility of the recipient to ensure that the onward transmission, opening or use of this message and any attachments will not adversely affect its systems or data. Any information, views or opinions expressed in this e-mail or any attachments are not necessarily those of Monitise... Monitise.. reserves the right to monitor, review and retain all e-mails travelling through its networks and systems (subject to and in accordance with local laws).

The Monitise group of companies comprise the following companies registered in England and Wales: Monitise plc (6011822), Monitise Group Limited (5590897), Monitise Limited (5556711), Monitise Business Solutions Limited (5814266) and a joint venture company, MONILINK Limited (4831976). Their registered office address is Providian House, 16 - 18 Monument Street, London, EC3R 8AJ.

Monitise.. and Accode.. are UK registered Trade Marks belonging to Monitise Group Limited. No representation or warranty is given as to their status outside of the UK.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]