Re: Bug in conflict summary after partial resolution
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 25 Apr 2013 15:14:50 +0100 (BST)
I (Julian Foad) wrote:
And I nominated it for back-port.
> There is a second bug, closely related. If there are multiple prop conflicts on
How hard can it be to add full support for marking individual properties as resolved? I see two distinct levels to "full support".
Firstly, to fix the bug in interactive resolution, support is needed in libsvn_wc to ensure that when a conflict resolver callback (called from libsvn_wc/conflicts.c) returns any kind of 'resolved' result for a property conflict, the WC should mark only that specific property as resolved. That would be enough to fix the interactive conflict resolution. I'm looking at how feasible this might be.
Secondly, we might want to enhance the 'svn resolve' UI to allow specifying a particular property. I see that as being a comparatively minor enhancement. (We could also add such an option to the svn_client_resolve() API, but the API can always be given a callback function that only resolves conflicts on a specific property so there is no need for the API to expose such an option explicitly.)
The best idea I have *short of* getting "full" support by fixing libsvn_wc is to make 'svn' track how many of the propery conflicts you resolved, and if you resolved some but not all of them then print a warning that all of the properties were marked as resolved. That's not great but would be simple to implement and would improve the user experience a bit.
It might be possible to leave all of the property conflicts on that node *unresolved* if they're not all resolved, which is probably a better user experience, but I'm not sure how we'd do that purely in the client. Once the callback has returned any kind of "resolved" result for one property, libsvn_wc currently marks all prop conflicts on the node as resolved before calling the callback for the next property, and I don't know of any good way to avoid that.
> As an enhancement, the Summary of Conflicts could usefully be printed *before*
r1471759 on trunk prints a summary of conflicts before interactive resolving.
I haven't proposed this for back-port. We could do if folks want it.
> Another minor observation. I wonder if some people will find the conflict
I'm not planning to tweak the wording at the moment.
This is an archived mail posted to the Subversion Dev mailing list.