Checkout
rhuijben
committed
on 17 Feb 15
On move-update layer copying remove ACTUAL nodes for nodes that no longer
exist and are not delete-delete conflicted.

While not really a bu… Show more
On move-update layer copying remove ACTUAL nodes for nodes that no longer

exist and are not delete-delete conflicted.

While not really a bug, leaving dangling ACTUAL records creates nonstandard

database states and therefore may trigger untested code paths.

(You might see this as changelists or property changes on newly added

files/directories)

* subversion/libsvn_wc/wc-queries.sql

 (STMT_CLEAR_ACTUAL_NODE_LEAVING_CONFLICT): New statement.

* subversion/libsvn_wc/wc_db.c

 (clear_or_remove_actual): New function.

 (svn_wc__db_op_copy_layer_internal): Call clear_or_remove_actual on

   removed nodes. Remove TODO comment.

* subversion/tests/libsvn_wc/op-depth-test.c

 (move_update_delete_mods,

  move4_update_delself_AAA): Extend expectations to make it easier

    to spot problems.

Show less