Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

"Bert Huijben" <bert_at_qqmail.nl> writes:

> In the update editor we could change the behavior of incoming symlink
> changes to be handled as a delete + add, introducing a tree conflict
> (and a local replacement of the incoming node to keep the original
> state) if there are local changes.
>
> I think I should be able to introduce this update editor behavior
> easily, but it is hard for me to test the on-disk symlink behavior. So
> I might break a few buildbot runs while working on this.

We are currently adding a tree conflcit but we are not doing a good job:

$ svn up wc --accept postpone
Updating 'wc':
   C wc/f
At revision 2.
Summary of conflicts:
  Tree conflicts: 1
$ svn st wc
D C wc/f
> local add, incoming add upon update
Summary of conflicts:
  Tree conflicts: 1

We have flagged an add-add conflict but it's more of an update-update
conflict. Also the working state is 'D' and that is probably never what
the user wants. To get to state 'R' the user must resolve the tree
conflict before doing the extra add.

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download