Checkout
Bert Huijben
committed
on 05 Jul 12
During update a deleted node is not replaced until close_file or
close_directory is called to add the replacement, so we can safely
delay th… Show more
During update a deleted node is not replaced until close_file or

close_directory is called to add the replacement, so we can safely

delay the updating of the tree conflict.

* subversion/libsvn_wc/update_editor.c

 (add_directory,

  add_file): Don't add the tree conflict here. Store it for a later install

    instead.

Show less