RE: svn commit: r1667280 - in /subversion/trunk/subversion: libsvn_wc/merge.c tests/cmdline/merge_tests.py
From: Bert Huijben <bert_at_qqmail.nl>
Date: Tue, 17 Mar 2015 22:11:28 +0100
> -----Original Message-----
I think it is better to make the interactive conflict resolver work the way we always installed binary conflicts since 1.0, than to change the way we install conflict markers for a bugfix of the conflict resolver.
In case of conflicts of a binary file there is no pre-merged file with conflict markers and therefore we just leave the 'mine' file just where it is... At the original location.
This patch introduces a second copy of the same file, while clients always had to handle this case for 1.0-1.8 anyway.
If the interactive conflict resolver needs a patch, we should probably also backport this patch.
This is an archived mail posted to the Subversion Dev mailing list.