[Subclipse-users] weird merging behavior

Hi,

i have trunk and a branch and i merge (currently using the merge client)
back and forward between the 2

now i just merged something

merge -c 22469
https://subversion.servoy.com/development/branches/v41x_branch/j2dbF:/workspace/j2db
    --- Merging r22468 through r22469 into F:/workspace/j2db
    C
F:/workspace/j2db/src/com/servoy/j2db/server/servlets/ConfigServlet.java
    Merge complete.
    ===== File Statistics: =====
    Conflicts: 1

This has a conflict, but that doesnt matter, only 1 file is merged/touched.
Also the merge results dialog is telling me that

But then when i look what files are changed then there are 5 other files
also seen as outgoing changes (but compare doesnt show any changes)
those are always the same 5 files over 3 dirs.

Even stranger is, this happens on both sides. So if i merge from
branch->trunk it happens but also from trunk->branch

What could that be? Who does touch those files?

johan

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=979618

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2008-12-04 15:02:51 CET