>
>
> I don't think this is a merge problem as much as a conflict resolution
> problem. Perhaps efforts would be a better invested in trying to improve
> the property conflict resolution mechanisms of 'svn resolve' to make
> your workflow easier?
>
> It sounds like if you'd be in less trouble if you could 'revert' individual
> property changes to the working copy's BASE state independently of the
> textual
> changes, perhaps as a batch operation. There's no technical reason why the
> conflict resolver couldn't be taught to make this easy but it's not
> implemented
>
I just re-read this Stefan and think I get what you are referring to. Are
you suggesting an additional parameter(s) to resolve that would allow
accepting of a specific property or properties as a whole instead of a
whole file including properties?
Something like "svn resolve foo.c --accept working --properties-only"?
That could work well.
Thanks,
Dan
Received on 2014-08-28 23:56:26 CEST