Merge Obstructed in the working copy

Hi, I'm not sure if what I'm seeing is expected.

I just made a brand new repository. I've a trunk folder to which I svn add and commit a file (foo.c). I then create a new branch from trunk. I edit line 1 of foo.c in both the trunk and branch, making sure they've different values. I commit that change. Now when I Merge the branch back to trunk I get a tree conflict (as expected).

Repeating the same steps *sometimes* (but not always, it seems random to me) that merge will let me Edit Conflicts during the merge so I can see a side-by-side diff and choose what I want the end result in any given conflicted file to look like.

But other times when I repeat the same steps I get a dialog like you see attached to this message.

This dialog only lets me accept the current working copy, or resolve later. If I resolve later, clicking Edit Conflicts on the file later opens the same dialog you see attached. If I accept the current working copy it seems that all future merges for this file from the branch to trunk ignore the changes that caused this tree conflict.

Short of knowing ahead of time what files between trunk and a branch have edited the same line, how do I resolve this issue with minimal effort?

Why on one Merge will it let me edit conflicts, but on another Merge I don't get the Edit/Resolve conflicts option during the Merge?

If there is a conflict in a file because the same line was edited in both a branch and trunk, then when doing the merge I should always be able to edit conflicts and see the side-by-side diff. Or if I choose "Resolve later" in the dialog presented then doing Edit Conflicts later should show the side-by-side diff (but it doesn't).

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3193444

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].