You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2016/11/21 09:46:25 UTC
RE: svn commit: r1770633 - in /subversion/trunk/subversion: libsvn_wc/wc_db_update_move.c tests/libsvn_client/conflicts-test.c
> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: maandag 21 november 2016 10:37
> To: commits@subversion.apache.org
> Subject: svn commit: r1770633 - in /subversion/trunk/subversion:
> libsvn_wc/wc_db_update_move.c tests/libsvn_client/conflicts-test.c
>
> Author: stsp
> Date: Mon Nov 21 09:36:30 2016
> New Revision: 1770633
>
> URL: http://svn.apache.org/viewvc?rev=1770633&view=rev
> Log:
> Fix a trivial bug in the update-incoming-move code.
>
> * subversion/libsvn_wc/wc_db_update_move.c
> (update_incoming_moved_node): Look at the correct WC relpath for the
> conflict
> victim's set of working nodes.
>
> * subversion/tests/libsvn_client/conflicts-test.c
> (test_list): Mark test_update_incoming_dir_move_with_nested_file_move as
> PASS.
>
> Modified:
> subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
> subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
>
> Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_u
> pdate_move.c?rev=1770633&r1=1770632&r2=1770633&view=diff
> ================================================================
> ==============
> --- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Nov
> 21 09:36:30 2016
> @@ -2059,7 +2059,7 @@ update_incoming_moved_node(node_move_bat
> src_relpath, b->src_op_depth, wcroot, scratch_pool,
> scratch_pool));
> SVN_ERR(get_working_info(&dst_props, &dst_checksum,
> - &dst_children, &dst_kind, dst_relpath,
> + &dst_children, &dst_kind, src_relpath,
> wcroot, scratch_pool, scratch_pool));
This doesn't look right...
Bigger diff:
===================================================================
--- trunk/subversion/libsvn_wc/wc_db_update_move.c (revision 1770632)
+++ trunk/subversion/libsvn_wc/wc_db_update_move.c (revision 1770633)
@@ -2056,13 +2056,13 @@
/* Compare the tree conflict victim's copied layer (the "source") with
* the working layer, i.e. look for changes layered on top of the copy. */
SVN_ERR(get_info(&src_props, &src_checksum, &src_children, &src_kind,
src_relpath, b->src_op_depth, wcroot, scratch_pool,
scratch_pool));
SVN_ERR(get_working_info(&dst_props, &dst_checksum,
- &dst_children, &dst_kind, dst_relpath,
+ &dst_children, &dst_kind, src_relpath,
wcroot, scratch_pool, scratch_pool));
if (src_kind == svn_node_none
|| (dst_kind != svn_node_none && src_kind != dst_kind))
{
SVN_ERR(tc_editor_delete(nmb, dst_relpath, dst_kind, src_kind,
It looks like you are now comparing the source with the highest op-depth info of the source...
Bert
Re: svn commit: r1770633 - in /subversion/trunk/subversion:
libsvn_wc/wc_db_update_move.c tests/libsvn_client/conflicts-test.c
Posted by 'Stefan Sperling' <st...@apache.org>.
On Mon, Nov 21, 2016 at 10:46:25AM +0100, Bert Huijben wrote:
>
>
> > -----Original Message-----
> > From: stsp@apache.org [mailto:stsp@apache.org]
> > Sent: maandag 21 november 2016 10:37
> > To: commits@subversion.apache.org
> > Subject: svn commit: r1770633 - in /subversion/trunk/subversion:
> > libsvn_wc/wc_db_update_move.c tests/libsvn_client/conflicts-test.c
> >
> > Author: stsp
> > Date: Mon Nov 21 09:36:30 2016
> > New Revision: 1770633
> >
> > URL: http://svn.apache.org/viewvc?rev=1770633&view=rev
> > Log:
> > Fix a trivial bug in the update-incoming-move code.
> >
> > * subversion/libsvn_wc/wc_db_update_move.c
> > (update_incoming_moved_node): Look at the correct WC relpath for the
> > conflict
> > victim's set of working nodes.
> >
> > * subversion/tests/libsvn_client/conflicts-test.c
> > (test_list): Mark test_update_incoming_dir_move_with_nested_file_move as
> > PASS.
> >
> > Modified:
> > subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
> > subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
> >
> > Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
> > URL:
> > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_u
> > pdate_move.c?rev=1770633&r1=1770632&r2=1770633&view=diff
> > ================================================================
> > ==============
> > --- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
> > +++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Nov
> > 21 09:36:30 2016
> > @@ -2059,7 +2059,7 @@ update_incoming_moved_node(node_move_bat
> > src_relpath, b->src_op_depth, wcroot, scratch_pool,
> > scratch_pool));
> > SVN_ERR(get_working_info(&dst_props, &dst_checksum,
> > - &dst_children, &dst_kind, dst_relpath,
> > + &dst_children, &dst_kind, src_relpath,
> > wcroot, scratch_pool, scratch_pool));
>
> This doesn't look right...
Indeed, it does not. Hence follow-up fixes (see r1770638).
> It looks like you are now comparing the source with the highest op-depth info of the source...
Yes! That's what I want :-)