Re: Inconsistent 'show help' commands in `svn resolve` (property conflicts vs text conflicts)

2016-06-13 Thread Stefan Sperling
On Mon, Jun 13, 2016 at 06:15:39PM +0300, Pavel Lyalyakin wrote: > Hello, > > I've been checking the conflict resolution tool to make necessary > adjustments to SVNBook 1.8 and noticed that text conflict resolution offers > to press (s) key to show the full list of available commands (e.g. like on

Inconsistent 'show help' commands in `svn resolve` (property conflicts vs text conflicts)

2016-06-13 Thread Pavel Lyalyakin
Hello, I've been checking the conflict resolution tool to make necessary adjustments to SVNBook 1.8 and noticed that text conflict resolution offers to press (s) key to show the full list of available commands (e.g. like on this screen output[*]): [[[ show all options (s): ]]] [[[ (s) - show this

We can now merge file renames (Re: svn commit: r1748236 - in /subversion/trunk/subversion: libsvn_client/conflicts.c tests/libsvn_client/conflicts-test.c

2016-06-13 Thread Stefan Sperling
On Mon, Jun 13, 2016 at 01:51:49PM -, s...@apache.org wrote: > Author: stsp > Date: Mon Jun 13 13:51:49 2016 > New Revision: 1748236 > > URL: http://svn.apache.org/viewvc?rev=1748236&view=rev > Log: > When merging an incoming file move, record this move in the working copy. > > This makes mer

Re: new svn conflict resolver status update

2016-06-13 Thread Stefan Sperling
On Mon, Jun 13, 2016 at 12:05:27AM +0200, Johan Corveleyn wrote: > To be honest, being able to use the python test framework would be a > lot more productive for me. Maybe I can look into how to make it > handle interactive prompting? Unless there's a reason why this would > be notoriously difficul