Hi,
we have the following situation:
1. A branch is created from trunk.
2. In trunk a line of code is added and commited as revision X
3. The line is removed again and commited as revision X+1
4. In branch changeset X+1 is merged from trunk
5. In branch changeset X is merged from trunk.
The problem is now that in the branch the line is still there and one
gets no warning from subversion that something is wrong.
Is this a bug in subversion? Why isn't there at least a merge conflict
for step 4?
Christoph
