Re: [RFC] Subversion command line UI for interactive conflict resolution

2016-10-13 Thread Ivan Zhakov
On 13 October 2016 at 15:23, Stefan Sperling 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 reposito

Re: [RFC] Subversion command line UI for interactive conflict resolution

2016-10-13 Thread Evgeny Kotkov
Ivan Zhakov writes: > 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 merge

Re: [RFC] Subversion command line UI for interactive conflict resolution

2016-10-13 Thread Stefan Sperling
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\te

[RFC] Subversion command line UI for interactive conflict resolution

2016-10-13 Thread Ivan Zhakov
Hi, I'm thinking new conflict resolution should look like in Subversion command line client. Currently 'svn resolve' works 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