Re: Switching

2013-08-24 Thread Travis Brown
rmissions. -- Travis [[[ If an unversioned directory exists when an versioned directory of the same name is incoming, don't create a tree conflict. Instead coopt the existing directory and all the unversioned objects within. * subversion/libsvn_wc/update_editor.c (add_directory

Re: Switching

2013-08-24 Thread Travis Brown
On Sat, Aug 24, 2013 at 09:53:14PM +0200, Stefan Sperling claimed: >On Sat, Aug 24, 2013 at 12:26:41PM -0700, Travis Brown wrote: >> That's just overcomplicating the issue. This doesn't even need to >> become a tree conflict. > >In my opinion it does need to be fl

Re: Switching

2013-08-25 Thread Travis Brown
On Sun, Aug 25, 2013 at 11:46:11AM +0200, Stefan Sperling claimed: >Looking at just one use case is not going to help us in the long term. >And I don't think we should hard-code conflict resolution behaviour in >the update/switch/merge logic. > >During 1.8 development, I did experiment with hard-co