Re: Tree conflict 'svn merge' message

2017-12-30 Thread Daniel Shahaf
Stefan Sperling wrote on Sat, 30 Dec 2017 17:58 +0100: > This could be a bug. Perhaps the wrong message is selected for some > reason. Can you please file an issue? I cannot look closely right now. Sure, https://issues.apache.org/jira/browse/SVN-4717. Excuse brevity. Daniel

Re: Tree conflict 'svn merge' message

2017-12-30 Thread Paul Hammant
Here's one from the past - https://issues.apache.org/jira/browse/SVN-3495 - A famous airline was the client back then and they were strangling their older (but accomplished) cgi-bin/C++ stack. We were doing concurrent development of consecutive releases. Different teams from two consultancies (Tho

Re: Tree conflict 'svn merge' message

2017-12-30 Thread Stefan Sperling
On Sat, Dec 30, 2017 at 03:28:19AM +, Daniel Shahaf wrote: > I just tried to merge the swig-py3 branch into trunk [not in order to > commit the merge, but only in order to run 'svn diff' on its result], > and got the following output from 'svn merge': > > [[[ > Summary of conflicts: > Tree c