Peter Parker wrote on Sat, Nov 13, 2010 at 05:55:06 +0100:
> Hello,
> I still have still issues with fixed issue:
> #3486 ("svn: Attempt to add tree conflict that already exists")
>
> See attached script for provoking this error.
>
With trunk, I get:
[[[
+ /home/daniel/src/svn/trunk/subversion/svn/svn merge '^/Source/branches/3.0'
-r5:9
subversion/libsvn_client/merge.c:8923: (apr_err=195016)
svn: Cannot merge into mixed-revision working copy [7:8]; try updating first
]]]
and when I add an '$svn up' before the '$svn merge', I get:
[[[
+ /home/daniel/src/svn/trunk/subversion/svn/svn merge '^/Source/branches/3.0'
-r5:9
--- Merging r6 into '.':
C dir/foo.c
Summary of conflicts:
Tree conflicts: 1
subversion/libsvn_wc/tree_conflicts.c:403: (apr_err=155016)
svn: Attempt to add tree conflict that already exists at
'/tmp/sandbox-scripts/wc/Source/trunk/dir/foo.c'
]]]
Attached the non-windows version of your script I used for testing.
Daniel
> Same results with webdav except you get additional error:
> svn: Attempt to add tree conflict that already exists at 'dir\foo.c'
> svn: Error reading spooled REPORT request response
>
> I used subversion 1.6.13 on windows (script should be easily adapted to
> unix(change line 2 and 8))
>
> Biggest problem is the bail out on merge leaving all other merges
> unprocessed.
>
> Best regards,
> Peter
>
>
