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

Garrett Rooney wrote:
> On 3/14/06, Simon Large <simon@skirridsystems.co.uk> wrote:
>> Garrett Rooney wrote:
>>> 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.
>> Any further comment on this? Should I file an issue?
>
> Yes, please do. I'm hoping to get a chance to look into it more
> closely, but I don't know when I'll find the time.

Filed as issue 2522.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org