Stefan Sperling wrote on Thu, Jan 20, 2011 at 16:24:21 +0100: > On Thu, Jan 20, 2011 at 03:09:57PM +0100, Ulrich Eckhardt wrote: > > What is "Existed"? > > $ svn up > svn: Failed to add directory 'foo': an unversioned directory of the same name > already exists > $ svn up --force > E foo > Updated to revision 3. > $ > > This cannot happen during merge though, so the help text for merge > shouldn't be listing it. >
What if a merge adds a file? % svn cp ^/A ^/A2 -mm % svn mkdir ^/A2/B2 -mm % svn co ^/A ./ % mkdir B2 % svn merge ^/A2 (untested)
