On Sat, Feb 04, 2017 at 07:21:50PM +0100, Stefan Sperling wrote: > On Sat, Feb 04, 2017 at 04:57:45PM +0100, Stefan Küng wrote: > > But the problem with the description not being updated still persists. > > OK, I believe I see the problem. > The *option* descriptions are updated. > But the conflict descriptions are not. I'll see what I can do about that.
Should be fixed by https://svn.apache.org/r1781696 But only for 'incoming delete' conflicts! For 'local missing' conflicts we currently lack the infrastructure to support selection of move targets. This should be fixed, too. If somebody wants to help out, then this might be a good task to get started in the conflict resolver code. It should be a mostly mechanical change, using the 'incoming delete' code as an example for adding the missing bits and pieces to the 'local missing' code.
