You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by ch...@ubs.com on 2012/02/14 13:54:22 UTC
RE: Bug (svn 1.7.1) with reintegrate merge and deleted symbolic links
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?
Regards
Christian
RE: Bug (svn 1.7.1) with reintegrate merge and deleted symbolic links
Posted by ch...@ubs.com.
Thank you very much Stefan!
Will try out the patch.
Visit our website at http://www.ubs.com
This message contains confidential information and is intended only
for the individual named. If you are not the named addressee you
should not disseminate, distribute or copy this e-mail. Please
notify the sender immediately by e-mail if you have received this
e-mail by mistake and delete this e-mail from your system.
E-mails are not encrypted and cannot be guaranteed to be secure or
error-free as information could be intercepted, corrupted, lost,
destroyed, arrive late or incomplete, or contain viruses. The sender
therefore does not accept liability for any errors or omissions in the
contents of this message which arise as a result of e-mail transmission.
If verification is required please request a hard-copy version. This
message is provided for informational purposes and should not be
construed as a solicitation or offer to buy or sell any securities
or related financial instruments.
UBS reserves the right to retain all messages. Messages are protected
and accessed only in legally justified cases.
Re: Bug (svn 1.7.1) with reintegrate merge and deleted symbolic links
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Feb 14, 2012 at 01:54:22PM +0100, christian.asmussen@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));