[python-committers] IMPORTANT: Strip your repos if you pulled recently

[Benjamin Peterson]

Oops, the bad one is actually

8889c9b5dd3a

2013/7/16 Ronald Oussoren <ronaldoussoren at mac.com>:
>
> On 16 Jul, 2013, at 18:03, Benjamin Peterson <benjamin at python.org> wrote:
>
>> It should be safe to continue pulling. Those revisions you see below
>> are ones committed after I stripped the repo.
>
> Isn't the first one the stripped changeset?
>
> Ronald
>
>>
>> 2013/7/16 Ronald Oussoren <ronaldoussoren at mac.com>:
>>>
>>> On 16 Jul, 2013, at 5:46, Benjamin Peterson <benjamin at python.org> wrote:
>>>
>>>> If you have c3a510b22218 in your repo, you will need to strip it like this
>>>>
>>>> $ hg strip c3a510b22218
>>>>
>>>> (make sure to have the mq extension enabled)
>>>>
>>>> Sorry for the trouble.
>>>
>>> If I do that and run "hg incoming" I get a number of incoming changes (see below).
>>> I did do some work before seeing your message, does that mean I've accidently
>>> reverted your fix to the repository?
>>>
>>> Ronald
>>>
>>>
>>> ronald at gondolin[0]$ hg pull -u
>>> pulling from ssh://hg@hg.python.org/cpython
>>> searching for changes
>>> adding changesets
>>> adding manifests
>>> adding file changes
>>> added 5 changesets with 4 changes to 1 files
>>> 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>>>
>>> [~/Projects/python/rw/default]
>>> ronald at gondolin[0]$ hg strip c3a510b22218
>>> 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>>> saved backup bundle to /Users/ronald/Projects/python/rw/default/.hg/strip-backup/c3a510b22218-backup.hg
>>>
>>> [~/Projects/python/rw/default]
>>> ronald at gondolin[0]$ hg incoming
>>> comparing with ssh://hg@hg.python.org/cpython
>>> searching for changes
>>> changeset:   84653:c3a510b22218
>>> branch:      3.3
>>> parent:      84651:e22dd5fda5a8
>>> user:        Benjamin Peterson <benjamin at python.org>
>>> date:        Mon Jul 15 19:15:34 2013 -0700
>>> summary:     check the return value of new_string() (closes #18470)
>>>
>>> changeset:   84654:2650127ce034
>>> parent:      84652:8a078bf3cf14
>>> parent:      84653:c3a510b22218
>>> user:        Benjamin Peterson <benjamin at python.org>
>>> date:        Mon Jul 15 20:47:47 2013 -0700
>>> summary:     merge 3.3 (closes #18470)
>>>
>>> changeset:   84655:72312ff5f712
>>> branch:      3.3
>>> parent:      84653:c3a510b22218
>>> user:        Benjamin Peterson <benjamin at python.org>
>>> date:        Mon Jul 15 20:50:22 2013 -0700
>>> summary:     move declaration to top of block
>>>
>>> changeset:   84656:daf9ea42b610
>>> parent:      84654:2650127ce034
>>> parent:      84655:72312ff5f712
>>> user:        Benjamin Peterson <benjamin at python.org>
>>> date:        Mon Jul 15 20:50:25 2013 -0700
>>> summary:     merge 3.3
>>>
>>> changeset:   84657:7272ef213b7c
>>> tag:         tip
>>> user:        Ronald Oussoren <ronaldoussoren at mac.com>
>>> date:        Tue Jul 16 08:32:05 2013 +0200
>>> summary:     Also remove a (broken) leaker test for the code removed in issue #18393.
>>>
>>>
>>
>>
>>
>> --
>> Regards,
>> Benjamin
>



-- 
Regards,
Benjamin