For what its worth, this sounds very much like some tree-conflicts badness that I ran into on occasion with 1.6. I was never able to reproduce it, since by the time I un-hosed my working copy, I'd forgotten what I had done to get myself into the mess in the first place. It's good to hear that it's fixed in 1.7.
-Hyrum On Mon, Aug 22, 2011 at 10:13 PM, Neels J Hofmeyr <ne...@elego.de> wrote: > I can reproduce the corrupted WC reported by David Wallace with 1.6.17. > 1.7.x does not show this bug. > > I have attached a reproduction script that is roughly based on David's > typescript, but is only a fraction of the size. > > The error occurs like this: > > - use Subversion release 1.6.17 > - update WC > - locally delete file 'foo' > - commit > - do *not* update. > - merge, so that file 'foo' is added (e.g. from another branch). > status becomes: A + foo > - update > - A tree conflict "local edit, incoming delete" is flagged. > > This is obviously wrong. The local 'foo' has been deleted (and committed). > Taking this situation further results in a truly corrupted WC: > > - resolve the tree conflict > - commit > > The committed result (svn cat <URL>) is different from the on-disk contents, > even though the file is claimed to be up-to-date. > > Trunk doesn't show this behavior (thumbs up for wc-ng), but we should try to > find a fix for 1.6.x. > > stsp, you wanna hunt this down? > > Thank you very much, Dave! Seriously bad mojo, as you said. Good work!! > ...even though it took ages to deflate your darn typescript ;) > > ~Neels > -- uberSVN: Apache Subversion Made Easy http://www.uberSVN.com/
