Re: Resoving tree conflicts results in inconsistent state between two working copies of same branch
From: Neels J Hofmeyr <neels_at_elego.de>
Date: Tue, 23 Aug 2011 05:13:05 +0200
I can reproduce the corrupted WC reported by David Wallace with 1.6.17.
I have attached a reproduction script that is roughly based on David's
The error occurs like this:
- use Subversion release 1.6.17
This is obviously wrong. The local 'foo' has been deleted (and committed).
- resolve the tree conflict
The committed result (svn cat <URL>) is different from the on-disk contents,
Trunk doesn't show this behavior (thumbs up for wc-ng), but we should try to
stsp, you wanna hunt this down?
Thank you very much, Dave! Seriously bad mojo, as you said. Good work!!
This is an archived mail posted to the Subversion Dev mailing list.