Re: Unusable working copy after add/rm/add/merge

On 3/10/06, Simon Large <simon@skirridsystems.co.uk> wrote:
> Hi folks,
>
> This was reported on the TSVN list today.
> Add file and commit
> Delete file and commit
> Add same filename again and commit.
> Merge -r3:1 to revert to original file.
> WC is terminally broken.
>
> It's a bit contrived, but it shouldn't break the WC.

Interestingly, if you insert an 'svn up' after the final 'svn ci' and
before the 'svn merge' it works fine. Must be something screwy in the
working copy code I guess.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Mar 11 01:47:48 2006