Resolving property conflicts

Specifically, I often have trouble with changes to the svn:externals
property.

When I'm using command-line tools, if I choose to manually edit the
property, I get my default text editor launched with the entire
property, with conflict markers added. When I save, the property is set
and I can mark the conflict as resolved.

When I'm using TortoiseSVN, I see a dialog with the conflict-markers and
some other text. There are choices to take the entire "theirs" or
"local" property, or to manually edit the property. Manually editing
brings up the properties dialog; I need to select the conflicting
property myself. When I do that, I just get the "local" version, with no
conflict markers.

For svn:externals and other properties, the problem is exacerbated,
because the default editor for the property is a dialog, so copy-paste
is cumbersome.

I'd prefer either my external diff tool, or an editor with the conflict
markers. Is there some way to accomplish this?

Additionally, after all the changes have been made manually, I cannot
seem to "resolve" the changes from the merge dialog. Right-clicking on
the "conflicted" entry in the merge dialog does not have a "mark as
resolved" option, and there is no button to that effect on the
double-click dialog for this property, either. I had to go into my
working copy for this option.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-14 23:20:46 CET