[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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.
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

Received on 2011-08-23 05:14:06 CEST

This is an archived mail posted to the Subversion Dev mailing list.