If you run the attached script with current trunk, svn bails out
and leaves the working copy in locked state.
The problem occurs when an update pulls down both a move and a
textual diff for a file in one go.
This is what I'm seeing:
+ svn update recipe/trunk2
Conflict discovered in 'recipe/trunk2/alpha.moved'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
svn: In directory 'recipe/trunk2'
svn: Can't open file 'recipe/trunk2/alpha.moved': No such file or directory
$ svn st recipe/trunk2
! L recipe/trunk2
A + C recipe/trunk2/alpha
> local edit, incoming delete upon update
$ ls -1 recipe/trunk2/