Derek Wallace <derek.wall...@intunenetworks.com> writes: > We use SVN switch command to "switch" between different TAGs for a folder. > > This has being working fine with 1.6.x. However now with 1.7.4 it produces a > SVN error. > > U models/micron/MT49H32M18C/ReleaseNotes.txt > U models/micron/MT49H32M18C/modulerelease.tcl > U models/micron/MT49H32M18C/rldram2.v > U models/micron/MT49H32M18C/ReleaseDiff.log > D models/cypress/CY7C1512V18/ReleaseNotes.txt > D models/cypress/CY7C1512V18/modulerelease.tcl > D models/cypress/CY7C1512V18/ReleaseDiff.log > svn: E235000: In file 'subversion/libsvn_wc/update_editor.c' line 1583: > assertion failed (action == svn_wc_conflict_action_edit || action == > svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace) > > > The next file to be checked out is **probably** a Linux soft link and this we > think is what triggers the error. > > The file links to a file that is a subfolder of the folder CY7C1512V18 > i.e. > CY7C1512V18.vhd is a link to vhdl/CY7C1512V18.vhd > > > > Ive tried to create a small recipe to reproduce the problem but havnt been > able to. > > What further information can I provide to help diagnose this issue.
Is it reproducible: if you start with a fresh checkout can you reproduce the error? Is it reproducible on a subset of the working copy: if you checkout "cypress" rather than "models" can you reproduce the error? Please describe the changes made by the switch. Running svn diff --summarive URL_OF_WC URL_OF_SWITCH_TARGET may help. -- Philip