You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/02/07 13:23:51 UTC
svn commit: r1241440 -
/subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
Author: stsp
Date: Tue Feb 7 12:23:50 2012
New Revision: 1241440
URL: http://svn.apache.org/viewvc?rev=1241440&view=rev
Log:
On the moves-scan-log branch, fix svn_wc__conflict_description2_dup().
* subversion/libsvn_wc/util.c
(svn_wc__conflict_description2_dup): Copy the new 'suggested_moves'
element, too.
Modified:
subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
Modified: subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c?rev=1241440&r1=1241439&r2=1241440&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c Tue Feb 7 12:23:50 2012
@@ -283,6 +283,9 @@ svn_wc__conflict_description2_dup(const
if (conflict->src_right_version)
new_conflict->src_right_version =
svn_wc_conflict_version_dup(conflict->src_right_version, pool);
+ if (conflict->suggested_moves)
+ new_conflict->suggested_moves = apr_array_copy(pool,
+ conflict->suggested_moves);
return new_conflict;
}
Re: svn commit: r1241440 -
/subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Feb 07, 2012 at 01:42:06PM +0100, Bert Huijben wrote:
> > Author: stsp
> > Date: Tue Feb 7 12:23:50 2012
> > New Revision: 1241440
> >
> > URL: http://svn.apache.org/viewvc?rev=1241440&view=rev
> > Log:
> > On the moves-scan-log branch, fix svn_wc__conflict_description2_dup().
> > + if (conflict->suggested_moves)
> > + new_conflict->suggested_moves = apr_array_copy(pool,
> > + conflict->suggested_moves);
>
> Does this also copy the values of the array?
The pointers, yes. But not the move info thingies they point to.
Maybe we should copy those, too?
RE: svn commit: r1241440 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: dinsdag 7 februari 2012 13:24
> To: commits@subversion.apache.org
> Subject: svn commit: r1241440 - /subversion/branches/moves-scan-
> log/subversion/libsvn_wc/util.c
>
> Author: stsp
> Date: Tue Feb 7 12:23:50 2012
> New Revision: 1241440
>
> URL: http://svn.apache.org/viewvc?rev=1241440&view=rev
> Log:
> On the moves-scan-log branch, fix svn_wc__conflict_description2_dup().
>
> * subversion/libsvn_wc/util.c
> (svn_wc__conflict_description2_dup): Copy the new 'suggested_moves'
> element, too.
>
> Modified:
> subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
>
> Modified: subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
> URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-
> log/subversion/libsvn_wc/util.c?rev=1241440&r1=1241439&r2=1241440&vie
> w=diff
> ==========================================================
> ====================
> --- subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
> (original)
> +++ subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c Tue
> Feb 7 12:23:50 2012
> @@ -283,6 +283,9 @@ svn_wc__conflict_description2_dup(const
> if (conflict->src_right_version)
> new_conflict->src_right_version =
> svn_wc_conflict_version_dup(conflict->src_right_version, pool);
> + if (conflict->suggested_moves)
> + new_conflict->suggested_moves = apr_array_copy(pool,
> + conflict->suggested_moves);
Does this also copy the values of the array?
Bert
>
> return new_conflict;
> }
>