Joel Low wrote on Sat, Feb 25, 2012 at 20:42:08 +0800:
> I've spent quite a bit of time trying to come up with a reproducible
> scenario but I can't come up with anything (similar to what you came
> up with, as close as I could with my set up). I do note that running
> svnversion yields 926:1307MS, even after running svn update and svn st
> doesn't show modified files, so I've just trashed the working copy and
> did a fresh checkout. I'll just assume that my WC was corrupt -- I'll
> try the merge and come back to this thread again if there are any
> further problems.
>
> Thanks for your help Daniel!
>
> Joel
Sounds good, thanks for your persistence. If you can figure out how to
reproduce the merge errors, or the svnversion-v.-'svn st' inconsistency,
please do let us know.
For future reference, when `svnversion` reports 'S' ('switched'), the
way to undo it is with something like
% svn switch $(svn info $wc | sed -ne 's/^URL: //p') $wc
or in English: run 'svn switch $URL' where $URL is whatever 'svn info'
prints.
Cheers,
Daniel
