Problem merging trunk-changes into branch including changes in directory-structure

[Stefan Förder | Quick-Lohn Software GmbH]

Hey,

I’ve got a problem with a specific merging operation. I’m merging the
changes that have been committed in the trunk regularly into my branch to
keep it updated. However, if there are files moved from one folder to
another in the trunk, which were changed earlier in the branch, then merging
seems to be impossible. 

Does anybody has a solution for that?

In detail I’m doing something like that:
- Create a branch from the trunk
- Change a file (a.java) in the branch
- Change the same file (a.java) in the trunk
- Do a merge from trunk to branch - that works fine, the changes were merged
into the branch
- Now I move a.java in the trunk to a subfolder, e.g. dirA/a.java
- I didn’t do another change to the file in the branch
- Now I merge the trunk into the branch once again
- Result: a tree conflict. “The last operation tried to delete/move/rename
the file ‘a.java’, but it was already edited.”

We have SVN 1.5.1 on the server and TortoiseSVN 1.6.10.

I would be grateful for some advice.

Cheers

Stefan