Merge Conflict Resolution - local add, incoming add upon merge

2013-09-27 Thread Graeme Hodgson
We have a couple scenarios that seem to cause merge conflicts when merging branch data back to the trunk. This is despite the user selecting --accept=theirs-full in the merge operation. The two scenarios are: 1) A file that was branched from the trunk is now deleted in the trunk and now is being a

Re: svn commit: r1526057 - in /subversion/trunk/subversion: include/svn_fs.h libsvn_fs_fs/fs.h libsvn_fs_fs/tree.c libsvn_fs_fs/util.c libsvn_fs_fs/util.h

2013-09-27 Thread Stefan Fuhrmann
On Wed, Sep 25, 2013 at 10:02 AM, Ivan Zhakov wrote: > On 25 September 2013 04:09, wrote: > > Author: stefan2 > > Date: Wed Sep 25 00:09:06 2013 > > New Revision: 1526057 > > > > URL: http://svn.apache.org/r1526057 > > Log: > > Make native svn_fs_move support in FSFS dependent on a format bump

Re: svn log --ignore-properties option

2013-09-27 Thread Johan Corveleyn
On Fri, Sep 27, 2013 at 12:40 AM, Ben Reser wrote: > On 9/26/13 12:45 PM, Mark Moe wrote: >> We found that about half the performance issue was solved by using >> "SVNPathAuthz off" while the other half was solved by skipping that >> big revision when doing svn log -v. Just the sheer transfer of