On 13 October 2016 at 15:23, Stefan Sperling <stsp_at_elego.de> wrote:
> On Thu, Oct 13, 2016 at 03:01:39PM +0200, Ivan Zhakov wrote:
>> I suggest to change behavior to something like the following:
>> [[[
>> $ svn resolve
>> Searching tree conflict details for
>> 'D:\ivan\svn\test-wc\add-versus-add\foo' in repository:
>> Checking r5... done
>> Tree conflict on 'D:\ivan\svn\test-wc\add-versus-add\foo':
>> File merged from '^/trunk/foo_at_2' to '^/branches/b1/foo_at_16' was moved
>> to '^/branches/b1/bar' by ivan in r5.
>> A file which differs from the corresponding file on the merge source
>> branch was found in the working copy.
>>
>> Resolution options:
>> (p) - postpone
>> (r) - mark as resolved
>> (m) - move and merge
>> (h) - help
>> (q) - postpone all remaining conflicts
>>
>> Select:
>> ]]]
>>
>> When user types 'h' the some prompt will be shown, but with more
>> detailed description:
>> [[[
>> Tree conflict on 'D:\ivan\svn\test-wc\add-versus-add\foo':
>> File merged from '^/trunk/foo_at_2' to '^/branches/b1/foo_at_16' was moved
>> to '^/branches/b1/bar' by ivan in r5.
>> A file which differs from the corresponding file on the merge source
>> branch was found in the working copy.
>>
>> Resolution options:
>> (p) - postpone
>> skip this conflict and leave it unresolved [postpone]
>> (r) - mark as resolved
>> accept current working copy state [working]
>> (m) - move and merge
>> move 'foo' to 'bar' and merge
>> (h) - help
>> (q) - postpone all remaining conflicts
>>
>> Select:
>> ]]]
>
> +1
>
> It might also be nice to show a detailed conflict description only
> if the user asks for help:
>
> File merged from '^/trunk/foo_at_2' to '^/branches/b1/foo_at_16' was moved
> to '^/branches/b1/bar' by ivan in r5.
> A file which differs from the corresponding file on the merge source
> branch was found in the working copy.
>
> By default we could show an abbreviated version of this description.
Good idea. But we need short_description API to implement this :)
--
Ivan Zhakov
Received on 2016-10-13 15:28:50 CEST