Inconsistent working copy state after "svn switch"

2011-02-04 Thread Florian Weimer
Switching a working copy to a branch where a locally modified file does not exist, and switch back to the original branch (without further changes) leaves the working copy in an inconsistent state. It is surprisingly difficult to recover from that situation. It seems that you have to delete the p

Re: Inconsistent working copy state after "svn switch"

2011-02-04 Thread Florian Weimer
* Florian Weimer: > Switching a working copy to a branch where a locally modified file > does not exist, and switch back to the original branch (without > further changes) leaves the working copy in an inconsistent state. It > is surprisingly difficult to recover from that situation. It seems >

Re: Inconsistent working copy state after "svn switch"

2011-02-05 Thread Stefan Sperling
On Fri, Feb 04, 2011 at 04:47:43PM +, Florian Weimer wrote: > * Florian Weimer: > > > Switching a working copy to a branch where a locally modified file > > does not exist, and switch back to the original branch (without > > further changes) leaves the working copy in an inconsistent state. I