Re: 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-20 Thread Stefan Sperling
On Mon, Jun 20, 2016 at 08:34:24AM +0200, Stefan Fuhrmann wrote: > Can you say what the main limitations are and whether you > plan to remove them? My guess would be: files only, one > move per file & conflict resolution cycle, no cyclic renames. > > -- Stefan^2. I expect to get directories worki

Re: 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-19 Thread Stefan Fuhrmann
On 13.06.2016 16:10, Stefan Sperling wrote: 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

Re: 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-14 Thread Johan Corveleyn
On Mon, Jun 13, 2016 at 4:10 PM, Stefan Sperling wrote: > 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 fil

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