Merge problem with different users

Hi,

We noticed the following problem:

We are usually working on the trunk, but for a change request we created a branch. Development continued on both, the trunk and the branch.

Some changes were made on the trunk including the deletion of some files, all changes were committed to the trunk.

User A wanted to merge the changes from the trunk into the branch using the "svn merge" command. Everything went fine, all updates have been recognized, the deleted files have been deleted on the branch. The merged results have been committed to the branch.

After a while, another user (User B) wanted to merge changes made in the meantime from the trunk into the branch.

He received the following messages for the files that have been deleted in the first merge (of User A): "Local delete, incoming delete upon merge". He marked the tree conflicts as resolved and checked in the merged version to the branch. The next time User B wanted to merge changes from the trunk to the branch, he received the same error messages for the same (deleted) files. He was not able to bring the branch to a state at which it could be reintegrated to the trunk.

When User A tried to do the merge, everything went fine and the branch could be reintegrated to the trunk.

After we noticed the same problem on different branches, we created a "merge user" who will be used to do the merging and reintegration as a work around.

Is this a known issue or is there another way of merging etc with different users?

We are using SVN 1.6.5 on CentOS 5

Thanks in advance and kind regards

Michael

Michael Ungruhe

Lead Consultant

T: +49 211 5355 513
F: +49 211 5355 99 513

CGI Information Systems and Management Consultants (Deutschland) GmbH
Niederkasseler Lohweg 175 - 40547 Düsseldorf - Germany
Registergericht/Company Number: AG Düsseldorf (HRB 51806) - Geschäftsführer/Managing Directors: Michael E. Roach, R. David Anderson, Donna Morea, Theodor Hirwatis, Faris Mohammed - Steuernummer/Tax No.: 103/5717/1949 | USt-Id.-Nr. DE 114 118 368 -
http://www.cgi.com
CONFIDENTIALITY NOTICE: Proprietary/Confidential Information belonging to CGI Group Inc. and its affiliates may be contained in this message. If you are not a recipient indicated or intended in this message (or responsible for delivery of this message to such person), or you think for any reason that this message may have been addressed to you in error, you may not use or copy or deliver this message to anyone else. In such case, you should destroy this message and are asked to notify the sender by reply email.

 
Received on 2010-09-03 10:09:16 CEST