Bug 340240

Description Steve Cohen 2011-03-16 16:16:59 EDT

Build Identifier: 3.6.1 M20100909-0800

I create a branch from the trunk.  Working exclusively in that branch, I made a number of changes and checked them in.  The trunk remains unchanged.  Having tested all the code in the branch, I now want to merge it back into the trunk.

I switch to the trunk in Eclipse.  I synchronize with the repository to make sure I am up to date.  I am up date.  I then invoke merge using the first "one URL" tab.  I give it the URL of the branch.  I choose nothing but default options, that is merge from the HEAD of the branch, no ignore ancestry, nothing.

As far as I am able to determine, SVN has correctly identified the changed files and merged them with my working copy of the trunk.  However, in the Synchronize window that opens, each of these changed files shows up with the double-arrow conflict indicator.  I must then go in and select "Mark as Merged".

I do so.  Now it tells me there are no more differences.  I then go back to the J2EE perspective and do Team Synchronize with Repository (that is, for the trunk).  Now it shows me all the changes I made, correctly, as changes, not as conflicts.

But why is this intermediate "mark as merged" Synchronize window presented to me and what is the point of it?  This interface is extremely confusing and the "help screens" do not explain what is going on.

Reproducible: Always