On Fri, Sep 03, 2010 at 12:53:34AM -0700, Ungruhe, Michael wrote: > 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
Sounds like some users didn't commmit mergeinfo correctly. What did the mergeinfo on the trunk look like after the first merge? svn propget -R -v svn:mergeinfo trunk_...@rev-of-first-merge-commit What did the mergeinfo on the branch look like after the first merge? svn propget -R -v svn:mergeinfo branch_...@rev-of-first-merge-commit What does the mergeinfo look like in all the other revisions where merges were committed? Why does your "merge user" fix the problem? Maybe that user is doing merges differently than some of the developers did? Stefan
