Neels Janosch Hofmeyr wrote:
> Stephen Butler wrote:
>> Quoting Neels Janosch Hofmeyr <neels_at_elego.de>:
>>
>>> Stephen Butler wrote:
>>>> This fix also eliminates the nonsensical "deleted with history" status
>>>> that used to be displayed for orphaned items.
>>> ...
>>>> - 'A/B2/E/alpha' : Item(status='D ', wc_rev='-', copied='+'),
>>>> + 'A/B2/E/alpha' : Item(status='D ', wc_rev=2),
>>>> 'A/B2/lambda' : Item(status='D ', wc_rev='-', copied='+'),
>>>> 'A/B2/F' : Item(status='D ', wc_rev='-', copied='+'),
>>>> })
>>> ...
>>>
>>> Just today I am intrigued by what a "deleted with history" means. I see
>>> there are others remaining. Are they valid, do they mean something? Or are
>>> all 'D+' stati bugs?
>> I'll bet they're 'svn copy' bugs. I must have missed something in the
>> wc-to-wc-copy code, which isn't used by merge.
>
> I'm getting the same 'D +' status in merge_tests.py 135, and I'm wondering
> if it needs fixing.
Sorry, I'm getting 'R +' in merge_tests.py 135, but no copying is involved.
Since the 'D' comes through first and is changed to an 'R' during
close_file(), it is most probably the same bug causing this '+' to appear.
~Neels
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2390492
Received on 2009-09-03 03:47:10 CEST