subversion: "integrate into branch" can never commit

i created a little project to figure out how subversion works. i committed a project to the trunk and then created a branch. on the branch, i made a small change and committed it. so far so good.
now, if i try to do changes -> repository -> right click on the new entry -> subversion -> integrate to branch, the entry was disabled. i randomly did stuff, and suddenly it was enabled. no idea how i did it. but that's not the problem. the problem is that after the merge, the commit fails:

svn: Commit failed (details follow):
svn: File or directory '' is out of date; try updating
svn: resource out of date; try updating
svn: CHECKOUT of '/svn/temp_dha_mergetests/!svn/ver/13/branches/ein_neuer_branch': 409 Conflict (http://svn001.to30.intern)

both projects are definately updated. if i do exactly the same, but rightclick on root icon on the right side of the panel instead of the "commit entry" on the left side, it works fine. what is the difference?

why does one way work, and the other fails?

nanother question: integrate project. does the order of the sources matter? if yes, what's the difference?

2 comments
Comment actions Permalink

another problem:
i tried to integrate a renamed class and got this error:
svn: 'T:\svnlabor\branches\ein_neuer_branch\SVN_Experimente\src\org\hamsterdevelopment\umbenannt.java' is not under version control
Changelist 55 (single|) integration faced problems

it works with new classes, delete seems to be broken (the files that should be deleted in the target working copy are "new" instead of gone - and rename is broken, i cannot complete the commit.
did i use it wrong? or is it just buggy? (i'm using idea 95.214 right now)

0
Comment actions Permalink

figured the first one out, i had my *.iws-file in the root directory, and it changes a lot

0

Please sign in to leave a comment.