On Tue, Feb 14, 2012 at 01:54:22PM +0100, christian.asmus...@ubs.com wrote:
> Dear *,
>
> I was happy to see subversion 1.7.3 was release and that many bugs were
> fixed.
>
> This bug did not get fixed though
> (http://subversion.tigris.org/issues/show_bug.cgi?id=4052) and that
> would have made me even happier J
>
> Has anyone had time to look into this?
Hi Christian,
I found some time to look into this and have committed a fix
and nominated the same for backport to the 1.7.x branch.
If you need this fix ASAP and you compile your own builds you
can apply the patch below.
Index: subversion/libsvn_client/merge.c
===================================================================
--- subversion/libsvn_client/merge.c (revision 1245286)
+++ subversion/libsvn_client/merge.c (working copy)
@@ -48,6 +48,7 @@
#include "svn_props.h"
#include "svn_time.h"
#include "svn_sorts.h"
+#include "svn_subst.h"
#include "svn_ra.h"
#include "client.h"
#include "mergeinfo.h"
@@ -1861,10 +1862,14 @@ files_same_p(svn_boolean_t *same,
working_rev.kind = svn_opt_revision_working;
/* Compare the file content, translating 'mine' to 'normal' form. */
- SVN_ERR(svn_client__get_normalized_stream(&mine_stream, wc_ctx,
- mine_abspath, &working_rev,
- FALSE, TRUE, NULL, NULL,
- scratch_pool, scratch_pool));
+ if (svn_prop_get_value(working_props, SVN_PROP_SPECIAL) != NULL)
+ SVN_ERR(svn_subst_read_specialfile(&mine_stream, mine_abspath,
+ scratch_pool, scratch_pool));
+ else
+ SVN_ERR(svn_client__get_normalized_stream(&mine_stream, wc_ctx,
+ mine_abspath, &working_rev,
+ FALSE, TRUE, NULL, NULL,
+ scratch_pool, scratch_pool));
SVN_ERR(svn_stream_open_readonly(&older_stream, older_abspath,
scratch_pool, scratch_pool));
