[Python-Dev] svnmerge init in the release26-maint branch?

[Thomas Heller]

Christian Heimes schrieb:
> Thomas Heller wrote:
>> I have a fix for a modulefinder crash that I'm going to commit
>> into the trunk. Since the bug is also in release26-maint I will
>> also backport it.  While preparing this I noticed that in the
>> release26-maint branch 'svnmerge init' has not yet been done.
> 
> Are you sure? I did a svnmerge init a couple of days after the 
> release26-maint branch was created. I can see the properties on the 
> branch, too.
> 
> .../python/release26-maint$ svn proplist -v . | grep svnmerge
>    svnmerge-blocked : 
> /python/trunk:66721-66722,66744-66745,66752,66756,66763-66765,66768,66791-66792,66857
>    svnmerge-integrated : 
> /python/trunk:1-66720,66723-66743,66746-66751,66753-66755,66757-66762,66766-66767,66769-66790,66793-66800,66802,66805-66812,66814-66821,66824-66831,66833-66835,66837-66851,66853,66858-66860,66862-66863,66881,66891,66906,66922,66928-66931,66933-66937,66939-66940,66958,66984,66995-66996,67000,67030-67031

Oh, sorry - I forgot to 'svn up' first.

-- 
Thanks,
Thomas